do "skip screen" tests in Init(), since Init() is still called even if we

SetNewScreen() in the screen ctor
2005-02-23 22:36:00 +00:00
parent 5ed6736eef
commit 456c2074e7
3 changed files with 10 additions and 16 deletions
@@ -15,7 +15,10 @@ REGISTER_SCREEN_CLASS( ScreenInstructions );
 ScreenInstructions::ScreenInstructions( CString sName ) : ScreenWithMenuElements( sName )
 {
 	LOG->Trace( "ScreenInstructions::ScreenInstructions()" );
+}

+void ScreenInstructions::Init()
+{
 	//
 	// Skip this screen unless someone chose easy or beginner
 	//
@@ -39,10 +42,7 @@ ScreenInstructions::ScreenInstructions( CString sName ) : ScreenWithMenuElements

 	if( GAMESTATE->m_PlayMode == PLAY_MODE_INVALID )
 		RageException::Throw( "The PlayMode has not been set.  A theme must set the PlayMode before showing ScreenInstructions." );
-}

-void ScreenInstructions::Init()
-{
 	ScreenWithMenuElements::Init();

 	m_sprHowToPlay.Load( THEME->GetPathG(m_sName,PlayModeToString(GAMESTATE->m_PlayMode)) );