r3932 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-26 14:35:15 -0400 (Sat, 26 Jul 2008)
New Revision: 3932

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/g_world.qc
Log:
fix two bugs


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2008-07-26 18:12:55 UTC (rev 3931)
+++ trunk/data/qcsrc/server/cl_client.qc	2008-07-26 18:35:15 UTC (rev 3932)
@@ -1004,6 +1004,8 @@
 		player_count = 0;
 	}
 
+	PlayerScore_Attach(self);
+
 	bot_clientconnect();
 
 	//if(g_domination)
@@ -1115,8 +1117,6 @@
 	if(entcs_start)
 		attach_entcs();
 
-	PlayerScore_Attach(self);
-
 	bot_relinkplayerlist();
 
 	self.spectatortime = time;

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-07-26 18:12:55 UTC (rev 3931)
+++ trunk/data/qcsrc/server/g_world.qc	2008-07-26 18:35:15 UTC (rev 3932)
@@ -1471,7 +1471,7 @@
 	if(WinningConditionHelper_winnerteam >= 0)
 		SetWinners(team, WinningConditionHelper_winnerteam);
 	
-	return GetWinningCode(WinningConditionHelper_topscore >= limit, WinningConditionHelper_equality);
+	return GetWinningCode(limit && (WinningConditionHelper_topscore >= limit), WinningConditionHelper_equality);
 }
 
 float WinningCondition_RanOutOfSpawns()