Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance

[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 870c26627819df6a7af355e508025a016ad5e243..c3840ac9e67f9a89b76ed9e1f67ec668d834811a 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -263,7 +263,7 @@ float w_laser(float req)
        else if (req == WR_THINK)
        {
                if (self.BUTTON_ATCK)
-               if (weapon_prepareattack(0, cvar("g_balance_laser_primary_refire")))
+               if (weapon_prepareattack(0, (cvar("g_balance_laser_primary_gauntlet") ? 0 : cvar("g_balance_laser_primary_refire"))))
                {
                        if(cvar("g_balance_laser_primary_gauntlet"))
                                W_Laser_Attack2(0);
@@ -275,7 +275,7 @@ float w_laser(float req)
                {
                        if(cvar("g_balance_laser_secondary"))
                        {
-                               if (weapon_prepareattack(0, cvar("g_balance_laser_secondary_refire")))
+                               if (weapon_prepareattack(0, (cvar("g_balance_laser_secondary_gauntlet") ? 0 : cvar("g_balance_laser_secondary_refire"))))
                                {
                                        if(cvar("g_balance_laser_secondary_gauntlet"))
                                                W_Laser_Attack2(1);