fix CoinMode toggling on ScreenTitleMenu

stepmania/src/PrefsManager.cpp

@@ -849,8 +849,8 @@ Premium	PrefsManager::GetPremium()
 
 
 #include "LuaFunctions.h"
-LuaFunction_NoArgs( CoinMode,	PREFSMAN->m_CoinMode )
-LuaFunction_NoArgs( Premium,	PREFSMAN->m_Premium )
+LuaFunction_NoArgs( CoinMode,	CoinModeToString(PREFSMAN->m_CoinMode) )
+LuaFunction_NoArgs( Premium,	PremiumToString(PREFSMAN->m_Premium) )
 
 
 /*

stepmania/src/ScreenAttract.cpp

@@ -88,8 +88,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 ScreenTitleMenu" );
-				SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
+				LOG->Trace("ScreenAttract::AttractInput: go to ScreenTitleBranch" );
+				SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
 				break;
 			default:
 				ASSERT(0);

stepmania/src/ScreenEdit.cpp

@@ -31,7 +31,7 @@ const float RECORD_HOLD_SECONDS = 0.3f;
 
 
 //
-// Defines specific to GameScreenTitleMenu
+// Defines specific to ScreenEdit
 //
 
 #define DEBUG_X			(SCREEN_LEFT + 10)

stepmania/src/ScreenEditCoursesMenu.cpp

@@ -50,7 +50,7 @@ void ScreenEditCoursesMenu::HandleScreenMessage( const ScreenMessage SM )
 	{
 	case SM_GoToPrevScreen:
 	case SM_GoToNextScreen:
-		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
+		SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
 		break;
 	}
 }

stepmania/src/ScreenEditMenu.cpp

@@ -51,7 +51,7 @@ void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM )
 		m_Selector.RefreshNotes();
 		break;
 	case SM_GoToPrevScreen:
-		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
+		SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
 		break;
 	case SM_GoToNextScreen:
 		SCREENMAN->SetNewScreen( "ScreenEdit" );

stepmania/src/ScreenEz2SelectMusic.cpp

@@ -373,7 +373,7 @@ void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM )
 	switch( SM )
 	{
 	case SM_GoToPrevScreen:
-		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
+		SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
 		break;
 	case SM_GoToNextScreen:
 		if( m_bGoToOptions )
@@ -387,7 +387,7 @@ void ScreenEz2SelectMusic::HandleScreenMessage( const ScreenMessage SM )
 		}
 		break;
 	case SM_NoSongs:
-		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
+		SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
 	break;
 	}
 

stepmania/src/ScreenEz2SelectPlayer.cpp

@@ -148,7 +148,7 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM )
 		break;
 	case SM_GoToPrevScreen:
 		SOUND->StopMusic();
-		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
+		SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
 		break;
 	case SM_GoToNextScreen:
 		SCREENMAN->SetNewScreen( NEXT_SCREEN );

stepmania/src/ScreenReloadSongs.cpp

@@ -74,7 +74,7 @@ void ScreenReloadSongs::Update( float fDeltaTime )
 
 	SONGMAN->Reload( m_LoadingWindow );
 	UNLOCKMAN->UpdateSongs();
-	SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
+	SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
 }
 
 /*

stepmania/src/ScreenStyleSplash.cpp

@@ -64,7 +64,7 @@ void ScreenStyleSplash::HandleScreenMessage( const ScreenMessage SM )
 	
 		break;
 	case SM_GoToPrevScreen:
-		SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
+		SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
 		break;
 	case SM_GoToNextScreen:
 		SCREENMAN->SetNewScreen( NEXT_SCREEN );

stepmania/src/ScreenTest.cpp

@@ -53,7 +53,7 @@ void ScreenTest::Input( const DeviceInput& DeviceI, const InputEventType type, c
 		if( DeviceI.button == KEY_ESC )
 		{
 			if( type != IET_FIRST_PRESS ) return;
-			SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
+			SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
 			return;
 		}
 	}

stepmania/src/ScreenTextEntry.cpp

@@ -3,7 +3,6 @@
 #include "PrefsManager.h"
 #include "ScreenManager.h"
 #include "GameSoundManager.h"
-#include "ScreenTitleMenu.h"
 #include "GameConstantsAndTypes.h"
 #include "PrefsManager.h"
 #include "ThemeManager.h"

stepmania/src/ScreenTitleMenu.cpp

@@ -114,16 +114,12 @@ 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( m_sName );
+		SCREENMAN->SetNewScreen( "ScreenTitleBranch" );
 		return;
 	}
 
 	if( m_In.IsTransitioning() || m_Back.IsTransitioning() ) /* not m_Out */
 		return;
-
-
-	if( PREFSMAN->GetCoinMode() != COIN_HOME )
-		return;
 	
 	//
 	// detect codes