Recode hard coded portions. Still broken with two players.

This commit is contained in:
Josh Allen
2005-02-09 04:24:41 +00:00
parent 891125b2df
commit 90e386f360
+13 -16
View File
@@ -54,16 +54,12 @@ void ScreenSMOnlineLogin::ImportOptions()
CStringArray::iterator iter; CStringArray::iterator iter;
iter = find( FOREACH_PlayerNumber( pn )
vsProfiles.begin(), {
vsProfiles.end(), iter = find(vsProfiles.begin(), vsProfiles.end(), PREFSMAN->m_sDefaultLocalProfileID[pn] );
PREFSMAN->m_sDefaultLocalProfileID[0] );
if( iter != vsProfiles.end() ) if( iter != vsProfiles.end() )
m_Rows[0]->SetOneSelection((PlayerNumber) 0, iter - vsProfiles.begin()); m_Rows[0]->SetOneSelection((PlayerNumber) pn, iter - vsProfiles.begin());
}
iter = find(vsProfiles.begin(), vsProfiles.end(), PREFSMAN->m_sDefaultLocalProfileID[1] );
if( iter != vsProfiles.end() )
m_Rows[0]->SetOneSelection((PlayerNumber) 1, iter - vsProfiles.begin());
} }
void ScreenSMOnlineLogin::ExportOptions() void ScreenSMOnlineLogin::ExportOptions()
@@ -71,11 +67,10 @@ void ScreenSMOnlineLogin::ExportOptions()
vector<CString> vsProfiles; vector<CString> vsProfiles;
PROFILEMAN->GetLocalProfileIDs( vsProfiles ); PROFILEMAN->GetLocalProfileIDs( vsProfiles );
if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 0)) FOREACH_EnabledPlayer( pn )
PREFSMAN->m_sDefaultLocalProfileID[0] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) 0)]; {
PREFSMAN->m_sDefaultLocalProfileID[pn] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) pn)];
if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 1)) }
PREFSMAN->m_sDefaultLocalProfileID[0] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) 1)];
} }
void ScreenSMOnlineLogin::GoToPrevScreen() void ScreenSMOnlineLogin::GoToPrevScreen()
@@ -86,8 +81,10 @@ void ScreenSMOnlineLogin::GoToPrevScreen()
void ScreenSMOnlineLogin::GoToNextScreen() void ScreenSMOnlineLogin::GoToNextScreen()
{ {
PREFSMAN->SaveGlobalPrefsToDisk(); PREFSMAN->SaveGlobalPrefsToDisk();
PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) 0); FOREACH_EnabledPlayer(pn)
PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) 1); //Update Profiles {
PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) pn);
}
if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 0) && GAMESTATE->IsPlayerEnabled((PlayerNumber) 1) && if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 0) && GAMESTATE->IsPlayerEnabled((PlayerNumber) 1) &&
(GAMESTATE->GetPlayerDisplayName((PlayerNumber) 0) == GAMESTATE->GetPlayerDisplayName((PlayerNumber) 1))) (GAMESTATE->GetPlayerDisplayName((PlayerNumber) 0) == GAMESTATE->GetPlayerDisplayName((PlayerNumber) 1)))