[nexuiz-commits] r7174 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-07-10 02:10:56 -0400 (Fri, 10 Jul 2009)
New Revision: 7174

Modified:
   trunk/data/qcsrc/server/constants.qh
   trunk/data/qcsrc/server/scores.qc
Log:
fix crash in CTF when bots are leaving at end of match


Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-07-09 20:35:42 UTC (rev 7173)
+++ trunk/data/qcsrc/server/constants.qh	2009-07-10 06:10:56 UTC (rev 7174)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "5b1cce9cce2493c11499473c959bad8f";
+string CVAR_CHECK_DEFAULT = "9b8ca48c50d9e2af73245655fdb29b04";
 string CVAR_CHECK_WEAPONS = "4f7b4c1e2feeef4988b02a93ff35a2ca";
 
 float	FALSE					= 0;

Modified: trunk/data/qcsrc/server/scores.qc
===================================================================
--- trunk/data/qcsrc/server/scores.qc	2009-07-09 20:35:42 UTC (rev 7173)
+++ trunk/data/qcsrc/server/scores.qc	2009-07-10 06:10:56 UTC (rev 7174)
@@ -92,10 +92,18 @@
 
 	if(!scores_initialized) return 0; // FIXME remove this when everything uses this system
 	if(t <= 0 || t >= 16)
+	{
+		if(gameover)
+			return 0;
 		error("Adding score to invalid team!");
+	}
 	s = teamscorekeepers[t - 1];
 	if(!s)
+	{
+		if(gameover)
+			return 0;
 		error("Adding score to unknown team!");
+	}
 	if(score)
 		if(teamscores_label[scorefield] != "")
 			s.SendFlags |= pow(2, scorefield);
@@ -299,7 +307,11 @@
 	if(!scores_initialized) return 0; // FIXME remove this when everything uses this system
 	s = player.scorekeeper;
 	if(!s)
+	{
+		if(gameover)
+			return 0;
 		error("Adding score to unknown player!");
+	}
 	if(score)
 		if(scores_label[scorefield] != "")
 			s.SendFlags |= pow(2, scorefield);
@@ -688,7 +700,11 @@
 	entity sk;
 
 	if(t <= 0 || t >= 16)
+	{
+		if(gameover)
+			return 0;
 		error("Reading score of invalid team!");
+	}
 
 	sk = teamscorekeepers[t - 1];
 	if not(sk)