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

SetNewScreen() in the screen ctor

stepmania/src/ScreenInstructions.cpp

@@ -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)) );

stepmania/src/ScreenSelectCharacter.cpp

@@ -52,7 +52,11 @@ REGISTER_SCREEN_CLASS( ScreenSelectCharacter );
 ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithMenuElements( sClassName )
 {	
 	LOG->Trace( "ScreenSelectCharacter::ScreenSelectCharacter()" );	
+}
 
+
+void ScreenSelectCharacter::Init()
+{
 	vector<Character*> apCharacters;
 	GAMESTATE->GetCharacters( apCharacters );
 	if(	apCharacters.empty() )
@@ -77,16 +81,6 @@ ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : ScreenWithM
 			return;
 		}
 	}
-}
-
-
-void ScreenSelectCharacter::Init()
-{
-	vector<Character*> apCharacters;
-	GAMESTATE->GetCharacters( apCharacters );
-	if(	apCharacters.empty() )
-		return;
-
 
 	ScreenWithMenuElements::Init();
 	

stepmania/src/ScreenSelectGroup.cpp

@@ -26,17 +26,17 @@ REGISTER_SCREEN_CLASS( ScreenSelectGroup );
 ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : ScreenWithMenuElements( sClassName )
 {	
 	LOG->Trace( "ScreenSelectGroup::ScreenSelectGroup()" );	
+}
 
+void ScreenSelectGroup::Init()
+{
 	if( !PREFSMAN->m_bShowSelectGroup )
 	{
 		GAMESTATE->m_sPreferredSongGroup = GROUP_ALL_MUSIC;
 		HandleScreenMessage( SM_GoToNextScreen );
 		return;
 	}
-}
 
-void ScreenSelectGroup::Init()
-{
 	ScreenWithMenuElements::Init();
 
 	vector<Song*> aAllSongs;