From 90e386f36082dd0e5b79cfddf3898498c82110d3 Mon Sep 17 00:00:00 2001 From: Josh Allen Date: Wed, 9 Feb 2005 04:24:41 +0000 Subject: [PATCH] Recode hard coded portions. Still broken with two players. --- stepmania/src/ScreenSMOnlineLogin.cpp | 31 ++++++++++++--------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/stepmania/src/ScreenSMOnlineLogin.cpp b/stepmania/src/ScreenSMOnlineLogin.cpp index bedfc41dc3..161b8fff48 100644 --- a/stepmania/src/ScreenSMOnlineLogin.cpp +++ b/stepmania/src/ScreenSMOnlineLogin.cpp @@ -54,16 +54,12 @@ void ScreenSMOnlineLogin::ImportOptions() CStringArray::iterator iter; - iter = find( - vsProfiles.begin(), - vsProfiles.end(), - PREFSMAN->m_sDefaultLocalProfileID[0] ); - if( iter != vsProfiles.end() ) - m_Rows[0]->SetOneSelection((PlayerNumber) 0, 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()); + FOREACH_PlayerNumber( pn ) + { + iter = find(vsProfiles.begin(), vsProfiles.end(), PREFSMAN->m_sDefaultLocalProfileID[pn] ); + if( iter != vsProfiles.end() ) + m_Rows[0]->SetOneSelection((PlayerNumber) pn, iter - vsProfiles.begin()); + } } void ScreenSMOnlineLogin::ExportOptions() @@ -71,11 +67,10 @@ void ScreenSMOnlineLogin::ExportOptions() vector vsProfiles; PROFILEMAN->GetLocalProfileIDs( vsProfiles ); - if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 0)) - PREFSMAN->m_sDefaultLocalProfileID[0] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) 0)]; - - if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 1)) - PREFSMAN->m_sDefaultLocalProfileID[0] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) 1)]; + FOREACH_EnabledPlayer( pn ) + { + PREFSMAN->m_sDefaultLocalProfileID[pn] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) pn)]; + } } void ScreenSMOnlineLogin::GoToPrevScreen() @@ -86,8 +81,10 @@ void ScreenSMOnlineLogin::GoToPrevScreen() void ScreenSMOnlineLogin::GoToNextScreen() { PREFSMAN->SaveGlobalPrefsToDisk(); - PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) 0); - PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) 1); //Update Profiles + FOREACH_EnabledPlayer(pn) + { + PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) pn); + } if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 0) && GAMESTATE->IsPlayerEnabled((PlayerNumber) 1) && (GAMESTATE->GetPlayerDisplayName((PlayerNumber) 0) == GAMESTATE->GetPlayerDisplayName((PlayerNumber) 1)))