fix some STestMode + preloading

stepmania/src/ScreenEvaluation.cpp

@@ -78,13 +78,15 @@ static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
 AutoScreenMessage( SM_PlayCheer )
 
 REGISTER_SCREEN_CLASS( ScreenEvaluation );
-ScreenEvaluation::ScreenEvaluation()
+void ScreenEvaluation::Init()
 {
+	LOG->Trace( "ScreenEvaluation::Init()" );
+
 	//
 	// debugging
 	//
 	
-	if( PREFSMAN->m_bScreenTestMode )
+	if( PREFSMAN->m_bScreenTestMode && CommonMetrics::INITIAL_SCREEN == m_sName )
 	{
 		PROFILEMAN->LoadFirstAvailableProfile(PLAYER_1);
 		PROFILEMAN->LoadFirstAvailableProfile(PLAYER_2);
@@ -125,7 +127,6 @@ ScreenEvaluation::ScreenEvaluation()
 			ss.m_player[p].m_vpPossibleSteps.push_back( GAMESTATE->m_pCurSteps[PLAYER_1] );
 			ss.m_player[p].m_iStepsPlayed = 1;
 			
-			
 			PO_GROUP_ASSIGN( GAMESTATE->m_pPlayerState[p]->m_PlayerOptions, ModsLevel_Stage, m_fScrollSpeed, 2.0f );
 			PO_GROUP_CALL( GAMESTATE->m_pPlayerState[p]->m_PlayerOptions, ModsLevel_Stage, ChooseRandomModifiers );
 		}
@@ -174,12 +175,6 @@ ScreenEvaluation::ScreenEvaluation()
 			ss.m_player[p].m_fLifeRemainingSeconds = randomf( 90, 580 );
 		}
 	}
-}
-
-
-void ScreenEvaluation::Init()
-{
-	LOG->Trace( "ScreenEvaluation::Init()" );
 
 	m_pStageStats = &STATSMAN->m_vPlayedStageStats.back();
 

stepmania/src/ScreenEvaluation.h

@@ -39,7 +39,6 @@ enum StatLine
 class ScreenEvaluation : public ScreenWithMenuElements
 {
 public:
-	ScreenEvaluation();
 	virtual void Init();
 	virtual void Input( const InputEventPlus &input );
 	virtual void HandleScreenMessage( const ScreenMessage SM );

stepmania/src/ScreenNameEntryTraditional.cpp

@@ -12,12 +12,13 @@
 #include "InputEventPlus.h"
 #include "RageInput.h"
 #include "RageLog.h"
+#include "CommonMetrics.h"
 
 REGISTER_SCREEN_CLASS( ScreenNameEntryTraditional );
 
 void ScreenNameEntryTraditional::Init()
 {
-	if( PREFSMAN->m_bScreenTestMode )
+	if( PREFSMAN->m_bScreenTestMode && CommonMetrics::INITIAL_SCREEN == m_sName )
 	{
 		GAMESTATE->m_bSideIsJoined[PLAYER_1] = true;
 		GAMESTATE->m_bSideIsJoined[PLAYER_2] = true;

stepmania/src/ScreenSelectMusic.cpp

@@ -55,20 +55,16 @@ static bool g_bSampleMusicWaiting = false;
 static RageTimer g_StartedLoadingAt(RageZeroTimer);
 
 REGISTER_SCREEN_CLASS( ScreenSelectMusic );
-ScreenSelectMusic::ScreenSelectMusic()
+void ScreenSelectMusic::Init()
 {
-	if( PREFSMAN->m_bScreenTestMode )
+	if( PREFSMAN->m_bScreenTestMode && CommonMetrics::INITIAL_SCREEN == m_sName )
 	{
 		GAMESTATE->m_PlayMode.Set( PLAY_MODE_REGULAR );
 		GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle(GAMEMAN->GetDefaultGame(),"versus") );
 		GAMESTATE->JoinPlayer( PLAYER_1 );
 		GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
 	}
-}
 
-
-void ScreenSelectMusic::Init()
-{
 	SAMPLE_MUSIC_DELAY.Load( m_sName, "SampleMusicDelay" );
 	SAMPLE_MUSIC_LOOPS.Load( m_sName, "SampleMusicLoops" );
 	SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS.Load( m_sName, "SampleMusicFallbackFadeInSeconds" );

stepmania/src/ScreenSelectMusic.h

@@ -29,7 +29,6 @@ const RString& SelectionStateToString( SelectionState ss );
 class ScreenSelectMusic : public ScreenWithMenuElements
 {
 public:
-	ScreenSelectMusic();
 	virtual ~ScreenSelectMusic();
 	virtual void Init();
 	virtual void BeginScreen();