r3989 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-31 02:01:42 -0400 (Thu, 31 Jul 2008)
New Revision: 3989

Modified:
   trunk/data/qcsrc/server/g_damage.qc
   trunk/data/qcsrc/server/scores.qc
Log:
fix Arena mode


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2008-07-31 05:52:54 UTC (rev 3988)
+++ trunk/data/qcsrc/server/g_damage.qc	2008-07-31 06:01:42 UTC (rev 3989)
@@ -50,10 +50,6 @@
 	// TODO route through PlayerScores instead
 	if(gameover) return;
 
-	if(g_arena)
-		if(cvar("g_arena_roundbased"))
-			return;
-
 	if(f < 0)
 	{
 		if(targ == attacker)
@@ -75,6 +71,10 @@
 
 	PlayerScore_Add(targ, SP_DEATHS, 1);
 
+	if(g_arena)
+		if(cvar("g_arena_roundbased"))
+			return;
+
 	// FIXME fix the mess this is (we have REAL points now!)
 	if(g_runematch)
 	{

Modified: trunk/data/qcsrc/server/scores.qc
===================================================================
--- trunk/data/qcsrc/server/scores.qc	2008-07-31 05:52:54 UTC (rev 3988)
+++ trunk/data/qcsrc/server/scores.qc	2008-07-31 06:01:42 UTC (rev 3989)
@@ -183,6 +183,9 @@
 		return;
 	if(g_lms)
 		return;
+	if(g_arena)
+		return;
+	//print("clear clear clear... HAHA\n");
 
 	sk = player.scorekeeper;
 	for(i = 0; i < MAX_SCORE; ++i)