From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 20 Nov 2010 06:40:54 +0000 (+0100)
Subject: campaigntimer: allow win by timelimit if no fraglimit is set
X-Git-Tag: xonotic-v0.1.0preview~116^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e6f743a136ec345093acaab69cf20d3ff446e876;p=xonotic%2Fxonotic-data.pk3dir.git

campaigntimer: allow win by timelimit if no fraglimit is set
---

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index 300d01a7a..1a8db10af 100644
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -188,7 +188,7 @@ void CampaignPreIntermission()
 
 	if(won == 1 && lost == 0 && checkrules_equality == 0 && cheatcount_total == 0)
 	{
-		if(cvar("timelimit") != 0  &&  time > cvar("timelimit") * 60) // checks if the timelimit has expired.
+		if(cvar("timelimit") != 0 && cvar("fraglimit") != 0 && time > cvar("timelimit") * 60) // checks if the timelimit has expired.
 		{
 			campaign_won = 0;
 			bprint("Time's up! The current level has been LOST.\n");
@@ -196,12 +196,12 @@ void CampaignPreIntermission()
 		}
 		else
 		{
-		campaign_won = 1;
-		bprint("The current level has been WON.\n");
-		// sound!	
+			campaign_won = 1;
+			bprint("The current level has been WON.\n");
+			// sound!
 		}
 	}
-	else if(cvar("timelimit") != 0  &&  time > cvar("timelimit") * 60)
+	else if(cvar("timelimit") != 0 && time > cvar("timelimit") * 60)
 	{
 		campaign_won = 0;
 		bprint("Time's up! The current level has been LOST.\n");