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

fix mods stored in profile cause DQ in Survival even though they're overridden

Browse Source
This commit is contained in:
Chris Danford
2005-11-02 20:02:47 +00:00
parent 4a37f2ecdc
commit e12e28d904
5 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+13 -1
View File
@@ -519,6 +519,8 @@ void GameState::FinishStage()
if( !m_bMultiplayer ) // no saved stats in multiplayer
CommitStageStats();
RestoreSelectedOptions();
m_bStatsCommitted = false;
// Increment the stage counter.
@@ -1039,7 +1041,10 @@ void GameState::ApplyModifiers( PlayerNumber pn, CString sModifiers )
void GameState::StoreSelectedOptions()
{
FOREACH_PlayerNumber( pn )
{
m_pPlayerState[pn]->m_StoredPlayerOptions = m_pPlayerState[pn]->m_PlayerOptions;
m_pPlayerState[pn]->m_StagePlayerOptions = m_pPlayerState[pn]->m_PlayerOptions;
}
m_StoredSongOptions = m_SongOptions;
}
@@ -1054,6 +1059,13 @@ void GameState::RestoreSelectedOptions()
m_SongOptions = m_StoredSongOptions;
}
void GameState::RestoreStageOptions()
{
FOREACH_PlayerNumber( pn )
m_pPlayerState[pn]->m_PlayerOptions = m_pPlayerState[pn]->m_StagePlayerOptions;
m_SongOptions = m_StoredSongOptions;
}
void GameState::ResetCurrentOptions()
{
FOREACH_PlayerNumber( p )
@@ -1191,7 +1203,7 @@ void GameState::SetNoteSkinForBeatRange( PlayerState* pPlayerState, const CStrin
BeatToNoteSkin[StartBeat] = sNoteSkin;
/* Return to the default note skin after the duration. */
BeatToNoteSkin[EndBeat] = pPlayerState->m_StoredPlayerOptions.m_sNoteSkin;
BeatToNoteSkin[EndBeat] = pPlayerState->m_StagePlayerOptions.m_sNoteSkin;
++m_BeatToNoteSkinRev;
}