Missed commit.

This commit is contained in:
Steve Checkoway
2006-06-29 01:11:10 +00:00
parent 37d164decc
commit 7e3622464a
+16 -17
View File
@@ -58,7 +58,6 @@ function ScreenPlayerOptionsNext()
end end
function GetGameplayScreen() function GetGameplayScreen()
if GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2() then return "ScreenGameplay" end
return "ScreenGameplay" return "ScreenGameplay"
end end
@@ -142,22 +141,22 @@ function GetGameplayNextScreen()
Trace( " IsExtraStage2 = "..tostring(GAMESTATE:IsExtraStage2()) ) Trace( " IsExtraStage2 = "..tostring(GAMESTATE:IsExtraStage2()) )
Trace( " Event mode = "..tostring(IsEventMode()) ) Trace( " Event mode = "..tostring(IsEventMode()) )
if Passed or GAMESTATE:IsCourseMode() or return SelectEvaluationScreen()
GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2() or -- if Passed or GAMESTATE:IsCourseMode() or
GetTopScreenMetric( "ShowEvaluationOnFail" ) == "1" -- GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2()
then -- then
Trace( "Go to evaluation screen" ) -- Trace( "Go to evaluation screen" )
return SelectEvaluationScreen() -- return SelectEvaluationScreen()
end -- end
--
if IsEventMode() then -- if IsEventMode() then
Trace( "Go to song selection screen" ) -- Trace( "Go to song selection screen" )
-- DeletePreparedScreens() -- -- DeletePreparedScreens()
return SongSelectionScreen() -- return SongSelectionScreen()
end -- end
--
Trace( "ScreenGameOver" ) -- Trace( "ScreenGameOver" )
return "ScreenGameOver" -- return "ScreenGameOver"
end end
local function ShowScreenInstructions() local function ShowScreenInstructions()