r4272 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-01 08:34:53 -0400 (Mon, 01 Sep 2008)
New Revision: 4272

Modified:
   trunk/data/qcsrc/server/cl_weapons.qc
   trunk/data/qcsrc/server/defs.qh
Log:
making an #ifdef for separate attack_finished times


Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2008-08-31 13:18:31 UTC (rev 4271)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2008-09-01 12:34:53 UTC (rev 4272)
@@ -250,11 +250,18 @@
 		}
 		else if (self.weaponentity.state == WS_READY)
 		{
+#ifdef INDEPENDENT_ATTACK_FINISHED
+			if(ATTACK_FINISHED(self) > time + frametime * 0.5)
+			{
+#endif
 			sound (self, CHAN_WEAPON, "weapons/weapon_switch.wav", VOL_BASE, ATTN_NORM);
 			self.weaponentity.state = WS_DROP;
 			// set up weapon switch think in the future, and start drop anim
 			weapon_thinkf(WFRAME_IDLE, cvar("g_balance_weaponswitchdelay"), w_clear);
 			weapon_boblayer1(PLAYER_WEAPONSELECTION_SPEED, PLAYER_WEAPONSELECTION_RANGE);
+#ifdef INDEPENDENT_ATTACK_FINISHED
+			}
+#endif
 		}
 	}
 

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2008-08-31 13:18:31 UTC (rev 4271)
+++ trunk/data/qcsrc/server/defs.qh	2008-09-01 12:34:53 UTC (rev 4272)
@@ -1,3 +1,5 @@
+#define INDEPENDENT_ATTACK_FINISHED
+
 float require_spawnfunc_prefix; // if this float exists, only functions with spawnfunc_ name prefix qualify as spawn functions
 
 #define BUTTON_ATCK   button0
@@ -401,7 +403,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]))
+#else
+#define ATTACK_FINISHED(ent) ((ent).attack_finished_single)
+#endif
 
 // assault game mode: Which team is attacking in this round?
 float assault_attacker_team;