Merge remote-tracking branch 'origin/master' into samual/balance

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

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 749b0523d43888be6d21e4b6f687fb60ba4a9654..a7e5c4df7d272f785e3dd2fc7d4e576eed97806e 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -232,15 +232,7 @@ float w_laser(float req)
                {
                        if (weapon_prepareattack(0, autocvar_g_balance_laser_primary_refire))
                        {
-                               // if this weapon is reloadable, decrease its load
-                               if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-                               {
-                                       if(autocvar_g_balance_laser_reload_ammo)
-                                       {
-                                               self.clip_load -= 1;
-                                               self.weapon_load[WEP_LASER] = self.clip_load;
-                                       }
-                               }
+                               W_DecreaseAmmo(ammo_none, 1, TRUE);
 
                                W_Laser_Attack(0);
                                weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_laser_primary_animtime, w_ready);
@@ -250,15 +242,7 @@ float w_laser(float req)
                {
                        if(autocvar_g_balance_laser_secondary)
                        {
-                               // if this weapon is reloadable, decrease its load
-                               if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-                               {
-                                       if(autocvar_g_balance_laser_reload_ammo)
-                                       {
-                                               self.clip_load -= 1;
-                                               self.weapon_load[WEP_LASER] = self.clip_load;
-                                       }
-                               }
+                               W_DecreaseAmmo(ammo_none, 1, TRUE);
 
                                if (weapon_prepareattack(0, 0))
                                {
@@ -280,11 +264,12 @@ float w_laser(float req)
                precache_model ("models/weapons/h_laser.iqm");
                precache_sound ("weapons/lasergun_fire.wav");
                precache_sound ("weapons/gauntlet_fire.wav");
-               precache_sound ("weapons/reload.wav");
+               //precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound somewhere else
        }
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_LASER);
+               self.current_ammo = ammo_none;
        }
        else if (req == WR_CHECKAMMO1)
        {
@@ -296,7 +281,7 @@ float w_laser(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Reload(zero_ammo, 0, autocvar_g_balance_laser_reload_ammo, autocvar_g_balance_laser_reload_time, "weapons/reload.wav");
+               W_Reload(0, autocvar_g_balance_laser_reload_ammo, autocvar_g_balance_laser_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };