remove some hardcoded screen names

stepmania/Themes/default/metrics.ini

@@ -42,6 +42,7 @@ NextScreen2=screen,ScreenTitleJoin
 Class=ScreenTitleMenu
 Fallback=ScreenCaution
 PrevScreen=ScreenCompany
+CoinModeChangeScreen=ScreenTitleBranch
 SharedPreviewAndCursor=1
 AllowDisabledPlayerInput=1
 ChoiceNames=1,2,3,4,5,6,7
@@ -3035,6 +3036,9 @@ StyleIcon=0
 MemoryCardIcons=0
 TimerSeconds=0
 
+[ScreenAttract]
+StartScreen=ScreenTitleBranch
+
 [ScreenUnlock]
 Fallback=ScreenAttract
 UseUnlocksDat=1

stepmania/src/ScreenAttract.cpp

@@ -18,6 +18,7 @@
 #include "BGAnimation.h"
 
 #define NEXT_SCREEN				THEME->GetMetric (m_sName,"NextScreen")
+#define START_SCREEN			THEME->GetMetric ("ScreenAttract","StartScreen")
 
 
 REGISTER_SCREEN_CLASS( ScreenAttract );
@@ -89,8 +90,8 @@ void ScreenAttract::AttractInput( const DeviceInput& DeviceI, const InputEventTy
 					SCREENMAN->PlayCoinSound();
 				SCREENMAN->SendMessageToTopScreen( SM_StopMusic );
 				usleep( (int)(JOIN_PAUSE_SECONDS*1000*1000) );	// do a little pause, like the arcade does
-				LOG->Trace("ScreenAttract::AttractInput: go to ScreenTitleBranch" );
-				SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
+				LOG->Trace("ScreenAttract::AttractInput: go to START_SCREEN" );
+				SCREENMAN->SetNewScreen( START_SCREEN );
 				break;
 			default:
 				ASSERT(0);

stepmania/src/ScreenTitleMenu.cpp

@@ -26,6 +26,8 @@
 #include "PlayerState.h"
 
 #define MAX_STAGES_TEXT				THEME->GetMetric (m_sName,"MaxStagesText")
+#define COIN_MODE_CHANGE_SCREEN		THEME->GetMetric (m_sName,"CoinModeChangeScreen")
+
 
 REGISTER_SCREEN_CLASS( ScreenTitleMenu );
 ScreenTitleMenu::ScreenTitleMenu( CString sScreenName ) : 
@@ -113,7 +115,7 @@ void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType ty
 	 * so that the right m_aGameCommands will show */
 	if( ScreenAttract::ChangeCoinModeInput( DeviceI, type, GameI, MenuI, StyleI ) )
 	{
-		SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
+		SCREENMAN->SetNewScreen( COIN_MODE_CHANGE_SCREEN );
 		return;
 	}