include IsCourse(), fix StageDisplay for courses!

(cherry picked from commit 56003157f77be78bd5ab9e608b1f3836cf288e08)
2014-08-28 06:01:17 -05:00
parent 91581bb5f7
commit 04da3fb9c7
3 changed files with 14 additions and 5 deletions
@@ -121,9 +121,7 @@ Branch = {
 		elseif STATSMAN:GetCurStageStats():AllFailed() then
 			return "ScreenGameOver"
 		elseif GAMESTATE:GetSmallestNumStagesLeftForAnyHumanPlayer() == 0 then
-			if GAMESTATE:GetPlayMode() ~= "PlayMode_Regular" 
-			and GAMESTATE:GetPlayMode() ~= "PlayMode_Battle"
-			and GAMESTATE:GetPlayMode() ~= "PlayMode_Rave" then
+			if IsCourse() then
 				return "ScreenEvaluationSummary"
 			else
 				return "ScreenGameOver"
@@ -210,6 +210,11 @@ function IsFreePlay()
 	return IsArcade() and (GAMESTATE:GetCoinMode() == 'CoinMode_Free') or false
 end

+function IsCourse()
+	local pm = GAMESTATE:GetPlayMode();
+	return pm == "PlayMode_Nonstop" or "PlayMode_Oni" or "PlayMode_Endless"
+end
+
 function ArgsIfPlayerJoinedOrNil(arg1,arg2)
 	if arg1==nil then arg1=arg2
 	elseif arg2==nil then arg2=arg1 end