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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-27 13:52:23 -0400 (Sun, 27 Sep 2009)
New Revision: 7960

Modified:
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/defs.qh
Log:
also reset all attack_finished vars on spawn


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-09-27 17:49:17 UTC (rev 7959)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-09-27 17:52:23 UTC (rev 7960)
@@ -738,7 +738,10 @@
 
 		// reset fields the weapons may use just in case
         for (j = WEP_FIRST; j <= WEP_LAST; ++j)
+		{
             weapon_action(j, WR_RESETPLAYER);
+			ATTACK_FINISHED_FOR(self, j) = 0;
+		}
 	}
 }
 

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2009-09-27 17:49:17 UTC (rev 7959)
+++ trunk/data/qcsrc/server/defs.qh	2009-09-27 17:52:23 UTC (rev 7960)
@@ -393,10 +393,11 @@
 .float	attack_finished_for[WEP_COUNT];
 .float attack_finished_single;
 #ifdef INDEPENDENT_ATTACK_FINISHED
-#define ATTACK_FINISHED(ent) ((ent).(attack_finished_for[(ent).weapon]))
+#define ATTACK_FINISHED_FOR(ent,w) ((ent).(attack_finished_for[(w) - WEP_FIRST]))
 #else
-#define ATTACK_FINISHED(ent) ((ent).attack_finished_single)
+#define ATTACK_FINISHED_FOR(ent,w) ((ent).attack_finished_single)
 #endif
+#define ATTACK_FINISHED(ent) ATTACK_FINISHED_FOR(ent,(ent).weapon)
 
 // assault game mode: Which team is attacking in this round?
 float assault_attacker_team;