Remove parts of a forgotten feature

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index 4ce665dc7d7fe74e4312e66917224b92ca470384..ebf7c24e5f9aa16fc4a375e796130029c28e1071 100644 (file)
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -13,12 +13,6 @@ REGISTER_WEAPON(HOOK, w_hook, IT_CELLS|IT_FUEL, 0, WEP_FLAG_CANCLIMB | WEP_TYPE_
 .float hook_time_hooked;
 .float hook_time_fueldecrease;
 
-void W_Hook_SetAmmoCounter()
-{
-       // this weapon doesn't have a reload system, so always set the clip to 0 when switching to it
-       self.clip_load = self.clip_size = 0; // also keeps crosshair ammo from displaying
-}
-
 void W_Hook_ExplodeThink (void)
 {
        float dt, dmg_remaining_next, f;
@@ -234,7 +228,6 @@ float w_hook(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_HOOK);
-               W_Hook_SetAmmoCounter();
                self.hook_state &~= HOOK_WAITING_FOR_RELEASE;
        }
        else if (req == WR_CHECKAMMO1)

diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index d8a418ebb06c9931730e6ec80c0e372ec414390b..76b5a50729d94b64ad666a28bc97016d01d27d63 100644 (file)
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -7,12 +7,6 @@ REGISTER_WEAPON(PORTO, w_porto, 0, 0, WEP_TYPE_OTHER, 0, "porto" , "porto", _("P
 .float porto_v_angle_held;
 .vector right_vector;
 
-void W_Porto_SetAmmoCounter()
-{
-       // this weapon doesn't have a reload system, so always set the clip to 0 when switching to it
-       self.clip_load = self.clip_size = 0; // also keeps crosshair ammo from displaying
-}
-
 void W_Porto_Success (void)
 {
        if(self.owner == world)
@@ -278,7 +272,6 @@ float w_porto(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_PORTO);
-               W_Porto_SetAmmoCounter();
        }
        else if (req == WR_RESETPLAYER)
        {

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 0973c5f92a8a24c4da171faa91e64f24cfe05f6e..00c083956df2cf89b16c9a462b1c523489f54b08 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -7,12 +7,6 @@ REGISTER_WEAPON(TUBA, w_tuba, 0, 1, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH, BOT_PICKU
 .entity tuba_note;
 .float tuba_smoketime;
 
-void W_Tuba_SetAmmoCounter()
-{
-       // this weapon doesn't have a reload system, so always set the clip to 0 when switching to it
-       self.clip_load = self.clip_size = 0; // also keeps crosshair ammo from displaying
-}
-
 float Tuba_GetNote(entity pl, float hittype)
 {
        float note;
@@ -244,7 +238,6 @@ float w_tuba(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_TUBA);
-               W_Porto_SetAmmoCounter();
        }
        else if (req == WR_CHECKAMMO1)
                return TRUE; // TODO use fuel?