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 9ba19f9d50f46c0731f7a03d6c4ab298ea0bd0b9..a7e5c4df7d272f785e3dd2fc7d4e576eed97806e 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -232,7 +232,7 @@ float w_laser(float req)
                {
                        if (weapon_prepareattack(0, autocvar_g_balance_laser_primary_refire))
                        {
-                               W_DecreaseAmmo(zero_ammo, 1, TRUE);
+                               W_DecreaseAmmo(ammo_none, 1, TRUE);
 
                                W_Laser_Attack(0);
                                weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_laser_primary_animtime, w_ready);
@@ -242,7 +242,7 @@ float w_laser(float req)
                {
                        if(autocvar_g_balance_laser_secondary)
                        {
-                               W_DecreaseAmmo(zero_ammo, 1, TRUE);
+                               W_DecreaseAmmo(ammo_none, 1, TRUE);
 
                                if (weapon_prepareattack(0, 0))
                                {
@@ -264,12 +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 = zero_ammo;
+               self.current_ammo = ammo_none;
        }
        else if (req == WR_CHECKAMMO1)
        {
@@ -281,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;
 };