From 0f724021d43895ff01bd13ee1072dd0caf11996e Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 5 Sep 2010 17:42:22 +0300
Subject: [PATCH] Remove old bullet_counter, left from the Nexuiz weapons

---
 data/qcsrc/common/constants.qh       | 7 +++----
 data/qcsrc/server/cl_weaponsystem.qc | 2 --
 data/qcsrc/server/defs.qh            | 6 ------
 data/qcsrc/server/g_world.qc         | 1 -
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh
index d81983aa..d07d96b6 100644
--- a/data/qcsrc/common/constants.qh
+++ b/data/qcsrc/common/constants.qh
@@ -276,10 +276,9 @@ const float STAT_FUEL = 44;
 const float STAT_NB_METERSTART = 45;
 const float STAT_SHOTORG = 46; // compressShotOrigin
 const float STAT_LEADLIMIT = 47;
-const float STAT_BULLETS_LOADED = 48;
-const float STAT_STOMACH_LOAD = 49;
-const float STAT_STOMACH_DIGESTING = 50;
-const float STAT_STOMACH_EATEN = 51;
+const float STAT_STOMACH_LOAD = 48;
+const float STAT_STOMACH_DIGESTING = 49;
+const float STAT_STOMACH_EATEN = 50;
 const float CTF_STATE_ATTACK = 1;
 const float CTF_STATE_DEFEND = 2;
 const float CTF_STATE_COMMANDER = 3;
diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index dfe54765..3430c1a9 100644
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -971,7 +971,6 @@ void weapon_setup(float windex)
 	// the two weapon entities will notice this has changed and update their models
 	self.weapon = windex;
 	self.weaponname = e.mdl;
-	self.bulletcounter = 0;
 };
 
 // perform weapon to attack (weaponstate and attack_finished check is here)
@@ -1028,7 +1027,6 @@ float weapon_prepareattack(float secondary, float attacktime)
 		}
 		ATTACK_FINISHED(self) = ATTACK_FINISHED(self) + attacktime * W_WeaponRateFactor();
 	}
-	self.bulletcounter += 1;
 	//dprint("attack finished ", ftos(ATTACK_FINISHED(self)), "\n");
 	return TRUE;
 };
diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 440c0a2d..7572616c 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -540,10 +540,6 @@ float game_starttime; //point in time when the countdown is over
 vector railgun_start, railgun_end; // filled by FireRailgunBullet, used by damage code for head shot
 .float stat_allow_oldnexbeam;
 
-// reset to 0 on weapon switch
-// may be useful to all weapons
-.float bulletcounter;
-
 void target_voicescript_next(entity pl);
 void target_voicescript_clear(entity pl);
 
@@ -610,8 +606,6 @@ float client_cefc_accumulator;
 float client_cefc_accumulatortime;
 #endif
 
-.float campingrifle_bulletcounter;
-
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX
 
diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 02428103..7fcde6c2 100644
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -654,7 +654,6 @@ void spawnfunc_worldspawn (void)
 	addstat(STAT_DAMAGE_FIRED, AS_INT, stat_fired);
 	addstat(STAT_SHOTORG, AS_INT, stat_shotorg);
 	addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);
-	addstat(STAT_BULLETS_LOADED, AS_INT, campingrifle_bulletcounter);
 	addstat(STAT_STOMACH_LOAD, AS_INT, stat_stomachload);
 	addstat(STAT_STOMACH_DIGESTING, AS_INT, stat_digesting);
 	addstat(STAT_STOMACH_EATEN, AS_INT, stat_eaten);
-- 
2.39.2