Phase 2. A global ammo decreasing function. Still not fully ready

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_minelayer.qc

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 6d145b037939db621b9b06a9e0723322f6d5354e..3c9aac6cc22090bbad023cb39c930d0f1940b4f4 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -6,11 +6,6 @@ void W_Mine_Think (void);
 .float minelayer_detonate, minelayer_mines;
 .float mine_time;
 
-void W_MineLayer_Reload()
-{
-       W_Reload(ammo_rockets, autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav");
-}
-
 void spawnfunc_weapon_minelayer (void)
 {
        weapon_defaultspawnfunc(WEP_MINE_LAYER);
@@ -225,17 +220,7 @@ void W_Mine_Attack (void)
                }
        }
 
-       // if this weapon is reloadable, decrease its load. Else decrease the player's ammo
-       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-       {
-               if(autocvar_g_balance_minelayer_reload_ammo)
-               {
-                       self.clip_load -= autocvar_g_balance_minelayer_ammo;
-                       self.weapon_load[WEP_MINE_LAYER] = self.clip_load;
-               }
-               else
-                       self.ammo_rockets -= autocvar_g_balance_minelayer_ammo;
-       }
+       W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo);
 
        W_SetupShot_ProjectileSize (self, '-4 -4 -4', '4 4 4', FALSE, 5, "weapons/mine_fire.wav", CHAN_WEAPON, autocvar_g_balance_minelayer_damage);
        pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
@@ -390,7 +375,7 @@ float w_minelayer(float req)
        else if (req == WR_THINK)
        {
                if(autocvar_g_balance_minelayer_reload_ammo && self.clip_load < autocvar_g_balance_minelayer_ammo) // forced reload
-                       W_MineLayer_Reload();
+                       weapon_action(self.weapon, WR_RELOAD);
                else if (self.BUTTON_ATCK)
                {
                        if(weapon_prepareattack(0, autocvar_g_balance_minelayer_refire))
@@ -453,7 +438,7 @@ float w_minelayer(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_MineLayer_Reload();
+               W_Reload(ammo_rockets, autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };