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

simplify demo/jukebox setup

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-03 23:20:11 +00:00
parent 7af6018618
commit 5de58766e9
4 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenJukebox.cpp
+9 -12
View File
@@ -107,13 +107,19 @@ bool ScreenJukebox::SetSong( bool bDemonstration )
return false;
}
bool ScreenJukebox::PrepareForJukebox( bool bDemonstration ) // always return true.
ScreenJukebox::ScreenJukebox( CString sName ) : ScreenGameplay( "ScreenGameplay" )
{
LOG->Trace( "ScreenJukebox::ScreenJukebox()" );
m_bDemonstration = false;
}
void ScreenJukebox::Init()
{
// ScreeJukeboxMenu must set this
ASSERT( GAMESTATE->m_pCurStyle );
GAMESTATE->m_PlayMode = PLAY_MODE_REGULAR;
SetSong( bDemonstration );
SetSong( m_bDemonstration );
// ASSERT( GAMESTATE->m_pCurSong );
@@ -161,16 +167,7 @@ bool ScreenJukebox::PrepareForJukebox( bool bDemonstration ) // always return t
GAMESTATE->m_bDemonstrationOrJukebox = true;
return true;
}
ScreenJukebox::ScreenJukebox( CString sName, bool bDemonstration ) : ScreenGameplay( "ScreenGameplay", PrepareForJukebox(bDemonstration) ) // this is a hack to get some code to execute before the ScreenGameplay constructor
{
LOG->Trace( "ScreenJukebox::ScreenJukebox()" );
}
void ScreenJukebox::Init()
{
/* Now that we've set up, init the base class. */
ScreenGameplay::Init();
if( GAMESTATE->m_pCurSong == NULL ) // we didn't find a song.