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.
This commit is contained in:
AJ Kelly
2010-04-18 18:12:04 -05:00
parent d494ba5696
commit 05cdd2ab95
3 changed files with 14 additions and 11 deletions
+5 -5
View File
@@ -29,13 +29,13 @@ Branch = {
AfterProfileLoad = function() AfterProfileLoad = function()
if ( THEME:GetMetric("Common","AutoSetStyle") == true ) then if ( THEME:GetMetric("Common","AutoSetStyle") == true ) then
if IsNetConnected() then if IsNetConnected() then
-- use SelectPlayMode in online... -- use SelectStyle in online...
return "ScreenSelectPlayMode" return "ScreenSelectStyle"
else else
return "ScreenSelectPlayStyle" return "ScreenSelectPlayMode"
end end
else else
return "ScreenSelectPlayMode" return "ScreenSelectStyle"
end end
end, end,
AfterSelectPlayMode = function() AfterSelectPlayMode = function()
@@ -45,7 +45,7 @@ Branch = {
end end
if IsNetSMOnline() then return SMOnlineScreen() end if IsNetSMOnline() then return SMOnlineScreen() end
if IsNetConnected() then return "ScreenNetRoom" end if IsNetConnected() then return "ScreenNetRoom" end
return "ScreenSelectPlayStyle" return "ScreenSelectPlayMode"
end, end,
AfterSelectStyle = function() AfterSelectStyle = function()
if CHARMAN:GetAllCharacters() ~= nil then if CHARMAN:GetAllCharacters() ~= nil then
+7 -4
View File
@@ -1490,9 +1490,9 @@ LoadEdits=true
Fallback="ScreenWithMenuElements" Fallback="ScreenWithMenuElements"
Class="ScreenSelectProfile" Class="ScreenSelectProfile"
# #
NextScreen="ScreenSelectPlayMode" NextScreen="ScreenSelectStyle"
PrevScreen="ScreenTitleMenu" PrevScreen="ScreenTitleMenu"
StartScreen="ScreenSelectPlayMode" StartScreen="ScreenSelectStyle"
# #
TimerSeconds=40 TimerSeconds=40
# #
@@ -1501,7 +1501,9 @@ CodeUp="+Up"
CodeDown="+Down" CodeDown="+Down"
CodeStart="Start" CodeStart="Start"
CodeBack="Back" CodeBack="Back"
[ScreenSelectPlayMode]
[ScreenSelectStyle]
# (formerly known as ScreenSelectPlayMode before sm-ssc v1.0 beta 3)
Class="ScreenSelectMaster" Class="ScreenSelectMaster"
Fallback="ScreenSelectMaster" Fallback="ScreenSelectMaster"
# #
@@ -1534,7 +1536,8 @@ WrapScroller=true
ShowIcon=false ShowIcon=false
# #
[ScreenSelectPlayStyle] [ScreenSelectPlayMode]
# (formerly known as ScreenSelectPlayStyle before sm-ssc v1.0 beta 3)
Class="ScreenSelectMaster" Class="ScreenSelectMaster"
Fallback="ScreenSelectMaster" Fallback="ScreenSelectMaster"
# #
+2 -2
View File
@@ -746,7 +746,7 @@ ShowFooter=true
ShowHelp=true ShowHelp=true
[ScreenSelectProfile] [ScreenSelectProfile]
WaitForChildrenBeforeTweening=true WaitForChildrenBeforeTweening=true
[ScreenSelectPlayMode] [ScreenSelectStyle]
UpdateOnMesage="" UpdateOnMesage=""
# #
FOV=90 FOV=90
@@ -833,7 +833,7 @@ IconChoice14KeysY=SCREEN_CENTER_Y+48
IconChoice14KeysOnCommand=zoom,0;bounceend,0.35;zoom,1 IconChoice14KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
IconChoice14KeysOffCommand=linear,0.1175;zoomx,0 IconChoice14KeysOffCommand=linear,0.1175;zoomx,0
[ScreenSelectPlayStyle] [ScreenSelectPlayMode]
DefaultChoice="Normal" DefaultChoice="Normal"
ChoiceNames="Normal,Extended" ChoiceNames="Normal,Extended"
#~ ChoiceNames="Normal,Rave,Extended,Oni,Survival" #~ ChoiceNames="Normal,Rave,Extended,Oni,Survival"