From 05cdd2ab950e763200bdd8006a75930a77342ce3 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 18 Apr 2010 18:12:04 -0500
Subject: [PATCH] Fix a screen naming issue that's been bugging the main sm-ssc
 devs...

ScreenSelectPlayMode (formerly select style) has been renamed to ScreenSelectStyle.
ScreenSelectPlayStyle (formerly select play mode) has been renamed to ScreenSelectPlayMode.
---
 Themes/_fallback/Scripts/02 Branches.lua | 10 +++++-----
 Themes/_fallback/metrics.ini             | 11 +++++++----
 Themes/default/metrics.ini               |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua
index f8c63a1c80..aae6252222 100644
--- a/Themes/_fallback/Scripts/02 Branches.lua	
+++ b/Themes/_fallback/Scripts/02 Branches.lua	
@@ -29,13 +29,13 @@ Branch = {
 	AfterProfileLoad = function()
 		if ( THEME:GetMetric("Common","AutoSetStyle") == true ) then
 			if IsNetConnected() then
-				-- use SelectPlayMode in online...
-				return "ScreenSelectPlayMode"
+				-- use SelectStyle in online...
+				return "ScreenSelectStyle"
 			else
-				return "ScreenSelectPlayStyle"
+				return "ScreenSelectPlayMode"
 			end
 		else
-			return "ScreenSelectPlayMode"
+			return "ScreenSelectStyle"
 		end
 	end,
 	AfterSelectPlayMode = function()
@@ -45,7 +45,7 @@ Branch = {
 		end
 		if IsNetSMOnline() then return SMOnlineScreen() end
 		if IsNetConnected() then return "ScreenNetRoom" end
-		return "ScreenSelectPlayStyle"
+		return "ScreenSelectPlayMode"
 	end,
 	AfterSelectStyle = function()
 		if CHARMAN:GetAllCharacters() ~= nil then
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index df8a62cc12..c59ffc3d17 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1490,9 +1490,9 @@ LoadEdits=true
 Fallback="ScreenWithMenuElements"
 Class="ScreenSelectProfile"
 #
-NextScreen="ScreenSelectPlayMode"
+NextScreen="ScreenSelectStyle"
 PrevScreen="ScreenTitleMenu"
-StartScreen="ScreenSelectPlayMode"
+StartScreen="ScreenSelectStyle"
 #
 TimerSeconds=40
 #
@@ -1501,7 +1501,9 @@ CodeUp="+Up"
 CodeDown="+Down"
 CodeStart="Start"
 CodeBack="Back"
-[ScreenSelectPlayMode]
+
+[ScreenSelectStyle]
+# (formerly known as ScreenSelectPlayMode before sm-ssc v1.0 beta 3)
 Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
 #
@@ -1534,7 +1536,8 @@ WrapScroller=true
 ShowIcon=false
 #
 
-[ScreenSelectPlayStyle]
+[ScreenSelectPlayMode]
+# (formerly known as ScreenSelectPlayStyle before sm-ssc v1.0 beta 3)
 Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
 #
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 23bd9d43bf..a79447836e 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -746,7 +746,7 @@ ShowFooter=true
 ShowHelp=true
 [ScreenSelectProfile]
 WaitForChildrenBeforeTweening=true
-[ScreenSelectPlayMode]
+[ScreenSelectStyle]
 UpdateOnMesage=""
 #
 FOV=90
@@ -833,7 +833,7 @@ IconChoice14KeysY=SCREEN_CENTER_Y+48
 IconChoice14KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
 IconChoice14KeysOffCommand=linear,0.1175;zoomx,0
 
-[ScreenSelectPlayStyle]
+[ScreenSelectPlayMode]
 DefaultChoice="Normal"
 ChoiceNames="Normal,Extended"
 #~ ChoiceNames="Normal,Rave,Extended,Oni,Survival"