A persistent initial FailType now set in MachineOptions, but the temporary session FailType can be changed in SongOptions

This commit is contained in:
Chris Danford
2003-02-12 23:11:37 +00:00
parent 876a3f4499
commit 707b4fe817
13 changed files with 52 additions and 33 deletions
+2 -2
View File
@@ -100,7 +100,7 @@ bool SetUpSongOptions() // always return true.
GAMESTATE->m_PlayerOptions[p].m_bEffects[ PlayerOptions::EFFECT_MINI ] = true;
}
GAMESTATE->m_SongOptions.m_LifeType = SongOptions::LIFE_BATTERY;
PREFSMAN->m_FailType = PrefsManager::FAIL_OFF;
GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_OFF;
}
for( int p=0; p<NUM_PLAYERS; p++ )
@@ -115,7 +115,7 @@ bool SetUpSongOptions() // always return true.
GAMESTATE->m_SongOptions = SongOptions();
GAMESTATE->m_SongOptions.m_LifeType = (randomf(0,1)>0.8f) ? SongOptions::LIFE_BATTERY : SongOptions::LIFE_BAR;
PREFSMAN->m_FailType = PrefsManager::FAIL_OFF;
GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_OFF;
GAMESTATE->m_bDemonstration = true;