actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

force ScreenSelectProfile to load preferences; it doesn't increment playcount but i don't care right now

Browse Source
This commit is contained in:
AJ Kelly
2010-05-24 23:52:36 -05:00
parent e0d3c5ecd9
commit ac64504077
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenSelectProfile.cpp
+4 -2
View File
@@ -67,9 +67,7 @@ bool ScreenSelectProfile::Finish(){
// if profile indexes are the same for both players // if profile indexes are the same for both players
if( GAMESTATE->GetNumPlayersEnabled() == 2 && m_iSelectedProfiles[0] == m_iSelectedProfiles[1] && m_iSelectedProfiles[0] > 0 ) if( GAMESTATE->GetNumPlayersEnabled() == 2 && m_iSelectedProfiles[0] == m_iSelectedProfiles[1] && m_iSelectedProfiles[0] > 0 )
{
return false; return false;
}
int iUsedLocalProfiles = 0; int iUsedLocalProfiles = 0;
int iUnselectedProfiles = 0; int iUnselectedProfiles = 0;
@@ -108,6 +106,7 @@ bool ScreenSelectProfile::Finish(){
{ {
PROFILEMAN->m_sDefaultLocalProfileID[p].Set( PROFILEMAN->GetLocalProfileIDFromIndex( m_iSelectedProfiles[p] - 1 ) ); PROFILEMAN->m_sDefaultLocalProfileID[p].Set( PROFILEMAN->GetLocalProfileIDFromIndex( m_iSelectedProfiles[p] - 1 ) );
PROFILEMAN->LoadLocalProfileFromMachine( p ); PROFILEMAN->LoadLocalProfileFromMachine( p );
GAMESTATE->LoadCurrentSettingsFromProfile(p);
} }
if( m_iSelectedProfiles[p] == 0 ) if( m_iSelectedProfiles[p] == 0 )
{ {
@@ -119,7 +118,10 @@ bool ScreenSelectProfile::Finish(){
// Lock the card on successful load, so we won't allow it to be changed. // Lock the card on successful load, so we won't allow it to be changed.
if( bSuccess ) if( bSuccess )
{
GAMESTATE->LoadCurrentSettingsFromProfile(p);
MEMCARDMAN->LockCard( p ); MEMCARDMAN->LockCard( p );
}
} }
} }
StartTransitioningScreen( SM_GoToNextScreen ); StartTransitioningScreen( SM_GoToNextScreen );