Created GameLoop::ChangeGame analogous to GameLoop::ChangeTheme. Changed ChangeTheme to use the AfterThemeChangeScreen metric instead of a passed in screen name from the theme being changed away from. ChangeGame uses the AfterGameChangeScreen and AfterGameAndThemeChangeScreen metrics to pick the screen to load after the change. New metrics are optional and default to InitialScreen. Changed ScreenManager::ThemeChanged to not duplicate the code in ReloadOverlayScreens. Fixed ScreenManager::IsScreenNameValid to check with HasMetric before using GetMetric. Changed game ConfOption logic to set the preference and work in a similar way to the theme ConfOption. Added THEME:SetTheme lua function.

src/ScreenOptionsMaster.cpp

@@ -4,6 +4,7 @@
 #include "RageUtil.h"
 #include "RageLog.h"
 #include "ThemeManager.h"
+#include "GameManager.h"
 #include "GameState.h"
 #include "ScreenManager.h"
 #include "SongManager.h"
@@ -127,8 +128,7 @@ void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )
 			 * Otherwise, only reload it if it changed. */
 			RString sNewTheme = PREFSMAN->m_sTheme.Get();
 			bool bForceThemeReload = !!(m_iChangeMask & OPT_APPLY_ASPECT_RATIO) || !!(m_iChangeMask & OPT_APPLY_GRAPHICS);
-			GameLoop::ChangeTheme( sNewTheme, this->GetNextScreenName(), bForceThemeReload );
-			StepMania::ApplyGraphicOptions();
+			GameLoop::ChangeTheme( sNewTheme, bForceThemeReload );
 		}
 
 		if( m_iChangeMask & OPT_SAVE_PREFERENCES )
@@ -138,10 +138,9 @@ void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )
 			PREFSMAN->SavePrefsToDisk();
 		}
 
-		if( m_iChangeMask & OPT_RESET_GAME )
+		if( m_iChangeMask & OPT_CHANGE_GAME )
 		{
-			StepMania::ResetGame();
-			m_sNextScreen = StepMania::GetInitialScreen();
+			GameLoop::ChangeGame(PREFSMAN->GetCurrentGame());
 		}
 
 		if( m_iChangeMask & OPT_APPLY_SOUND )