From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 10 Mar 2012 19:46:59 +0000 (+0100)
Subject: don't do sudden death in campaign test run
X-Git-Tag: xonotic-v0.7.0~362
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e8c5bb4f83020535fb4bfc33f9b7445d174bb6c;p=xonotic%2Fxonotic-data.pk3dir.git

don't do sudden death in campaign test run
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 6f0e631ea..86f2b25bf 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1628,7 +1628,7 @@ float InitiateSuddenDeath()
 	// - for this timelimit_overtime needs to be >0 of course
 	// - also check the winning condition calculated in the previous frame and only add normal overtime
 	//   again, if at the point at which timelimit would be extended again, still no winner was found
-	if ((checkrules_overtimesadded >= 0) && (checkrules_overtimesadded < autocvar_timelimit_overtimes) && autocvar_timelimit_overtime && !(g_race && !g_race_qualifying))
+	if (!autocvar_g_campaign && (checkrules_overtimesadded >= 0) && (checkrules_overtimesadded < autocvar_timelimit_overtimes) && autocvar_timelimit_overtime && !(g_race && !g_race_qualifying))
 	{
 		return 1; // need to call InitiateOvertime later
 	}
@@ -1636,7 +1636,10 @@ float InitiateSuddenDeath()
 	{
 		if(!checkrules_suddendeathend)
 		{
-			checkrules_suddendeathend = time + 60 * autocvar_timelimit_suddendeath;
+			if(autocvar_g_campaign)
+				checkrules_suddendeathend = time; // no suddendeath in campaign
+			else
+				checkrules_suddendeathend = time + 60 * autocvar_timelimit_suddendeath;
 			if(g_race && !g_race_qualifying)
 				race_StartCompleting();
 		}