Added ScreenContinue:ContinueEnabled metric. Changed Actor:hidden and Lua scoring to emit errors because they are deprecated.

2014-09-15 05:09:27 -06:00
parent b8d5bce272
commit c45b5f053a
5 changed files with 15 additions and 5 deletions
@@ -408,7 +408,7 @@ DrawOrder = {

 -- deprecated aliases:
 function Actor:hidden(bHide)
-	Warn("hidden is deprecated, use visible instead. (used on ".. self:GetName() ..")")
+	lua.ReportScriptError("hidden is deprecated, use visible instead. (used on ".. self:GetName() ..")")
 	self:visible(not bHide)
 end

@@ -26,6 +26,14 @@ function SelectMusicOrCourse()
 	end
 end

+function GameOverOrContinue()
+	if THEME:GetMetric("ScreenContinue", "ContinueEnabled") then
+		return "ScreenContinue"
+	else
+		return "ScreenGameOver"
+	end
+end
+
 -- functions used for Routine mode
 function IsRoutine()
 	return GAMESTATE:GetCurrentStyle() and GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides"
@@ -126,12 +134,12 @@ Branch = {
 		if GAMESTATE:IsEventMode() then
 			return SelectMusicOrCourse()
 		elseif STATSMAN:GetCurStageStats():AllFailed() then
-			return "ScreenContinue"
+			return GameOverOrContinue()
 		elseif GAMESTATE:GetSmallestNumStagesLeftForAnyHumanPlayer() == 0 then
 			if not GAMESTATE:IsCourseMode() then
 				return "ScreenEvaluationSummary"
 			else
-				return "ScreenContinue"
+				return GameOverOrContinue()
 			end
 		else
 			return SelectMusicOrCourse()
@@ -242,7 +250,7 @@ Branch = {
 		return IsNetConnected() and "ScreenTitleMenu" or "ScreenTitleMenu"
 	end,
 	AfterSaveSummary = function()
-		return "ScreenContinue"
+		return GameOverOrContinue()
 --		[[ Enable when Finished ]]
 -- 		return GAMESTATE:AnyPlayerHasRankingFeats() and "ScreenNameEntryTraditional" or "ScreenGameOver"
 	end,