r5187 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Dec 10 08:14:28 EST 2008


Author: div0
Date: 2008-12-10 08:14:27 -0500 (Wed, 10 Dec 2008)
New Revision: 5187

Modified:
   trunk/data/qcsrc/server/g_world.qc
Log:
add "frags left" announcers back


Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-12-10 09:23:26 UTC (rev 5186)
+++ trunk/data/qcsrc/server/g_world.qc	2008-12-10 13:14:27 UTC (rev 5187)
@@ -1458,6 +1458,7 @@
 	cvar_set("g_maplist", result);
 }
 
+float leaderfrags;
 float WinningCondition_Scores(float limit)
 {
 	// TODO make everything use THIS winning condition (except LMS)
@@ -1483,6 +1484,22 @@
 		limit = -limit;
 	}
 
+	if(g_dm || (g_ctf && g_ctf_win_mode != 2) || g_tdm || g_arena || (g_race && !g_race_qualifying))
+	// these modes always score in increments of 1, thus this makes sense
+	{
+		if(leaderfrags != WinningConditionHelper_topscore)
+		{
+			leaderfrags = WinningConditionHelper_topscore;
+
+			if (leaderfrags == limit - 1)
+				play2all("announcer/robotic/1fragleft.wav");
+			else if (leaderfrags == limit - 2)
+				play2all("announcer/robotic/2fragsleft.wav");
+			else if (leaderfrags == limit - 3)
+				play2all("announcer/robotic/3fragsleft.wav");
+		}
+	}
+
 	return GetWinningCode(limit && WinningConditionHelper_topscore && (WinningConditionHelper_topscore >= limit), WinningConditionHelper_equality);
 }
 




More information about the nexuiz-commits mailing list