set GAMESTATE->m_bDemonstration before SGameplay ctor

This commit is contained in:
Glenn Maynard
2003-01-25 07:37:55 +00:00
parent d66b5b2f30
commit 9401751ec1
+2 -1
View File
@@ -129,13 +129,14 @@ bool SetUpSongOptions() // always return true.
GAMESTATE->m_SongOptions.m_LifeType = (randomf(0,1)>0.8f) ? SongOptions::LIFE_BATTERY : SongOptions::LIFE_BAR; GAMESTATE->m_SongOptions.m_LifeType = (randomf(0,1)>0.8f) ? SongOptions::LIFE_BATTERY : SongOptions::LIFE_BAR;
GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_OFF; GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_OFF;
GAMESTATE->m_bDemonstration = true;
return true; return true;
} }
ScreenDemonstration::ScreenDemonstration() : ScreenGameplay(SetUpSongOptions()) // this is a hack to get some code to execute before the ScreenGameplay constructor ScreenDemonstration::ScreenDemonstration() : ScreenGameplay(SetUpSongOptions()) // this is a hack to get some code to execute before the ScreenGameplay constructor
{ {
LOG->Trace( "ScreenDemonstration::ScreenDemonstration()" ); LOG->Trace( "ScreenDemonstration::ScreenDemonstration()" );
GAMESTATE->m_bDemonstration = true;
if( GAMESTATE->m_pCurSong == NULL ) // we didn't find a song. if( GAMESTATE->m_pCurSong == NULL ) // we didn't find a song.
{ {