Remove old bullet_counter, left from the Nexuiz weapons

diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh
index d81983aa9dceaa4e5adac1b169e5e250d7adcf00..d07d96b63b628d1f4c5601f9a6d73736452e7fb0 100644 (file)
--- 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;\r
 const float STAT_SHOTORG = 46; // compressShotOrigin\r
 const float STAT_LEADLIMIT = 47;\r
-const float STAT_BULLETS_LOADED = 48;\r
-const float STAT_STOMACH_LOAD = 49;\r
-const float STAT_STOMACH_DIGESTING = 50;\r
-const float STAT_STOMACH_EATEN = 51;\r
+const float STAT_STOMACH_LOAD = 48;\r
+const float STAT_STOMACH_DIGESTING = 49;\r
+const float STAT_STOMACH_EATEN = 50;\r
 const float CTF_STATE_ATTACK = 1;\r
 const float CTF_STATE_DEFEND = 2;\r
 const float CTF_STATE_COMMANDER = 3;\r

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index dfe547657b964cd614f3ee6cb15ca347fcf47c3a..3430c1a961ad6d0f4f656728756f064cfafcc01e 100644 (file)
--- 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\r
        self.weapon = windex;\r
        self.weaponname = e.mdl;\r
-       self.bulletcounter = 0;\r
 };\r
 \r
 // perform weapon to attack (weaponstate and attack_finished check is here)\r
@@ -1028,7 +1027,6 @@ float weapon_prepareattack(float secondary, float attacktime)
                }\r
                ATTACK_FINISHED(self) = ATTACK_FINISHED(self) + attacktime * W_WeaponRateFactor();\r
        }\r
-       self.bulletcounter += 1;\r
        //dprint("attack finished ", ftos(ATTACK_FINISHED(self)), "\n");\r
        return TRUE;\r
 };\r

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 440c0a2d4e1ce270be4706345797dc7017494d19..7572616c62be77c0c2f50b4dc170c05ae93daaf8 100644 (file)
--- 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\r
 .float stat_allow_oldnexbeam;\r
 \r
-// reset to 0 on weapon switch\r
-// may be useful to all weapons\r
-.float bulletcounter;\r
-\r
 void target_voicescript_next(entity pl);\r
 void target_voicescript_clear(entity pl);\r
 \r
@@ -610,8 +606,6 @@ float client_cefc_accumulator;
 float client_cefc_accumulatortime;\r
 #endif\r
 \r
-.float campingrifle_bulletcounter;\r
-\r
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE\r
 // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX\r
 \r

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index 024281035a44922112443e039577fafe7d287c56..7fcde6c22ce1f53dd7655ab786ba8f57dcf97d74 100644 (file)
--- 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);\r
        addstat(STAT_SHOTORG, AS_INT, stat_shotorg);\r
        addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);\r
-       addstat(STAT_BULLETS_LOADED, AS_INT, campingrifle_bulletcounter);\r
        addstat(STAT_STOMACH_LOAD, AS_INT, stat_stomachload);\r
        addstat(STAT_STOMACH_DIGESTING, AS_INT, stat_digesting);\r
        addstat(STAT_STOMACH_EATEN, AS_INT, stat_eaten);\r