refire 0 on gauntlet and electro lightning

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 8fd66038ea4b30ca31692a7d92e848d8e005c8f4..ef478e2b225e109170b53827e46ba5169e0c9a56 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -353,7 +353,7 @@ float w_electro(float req)
        {
                if (self.BUTTON_ATCK)
                {
-                       if (weapon_prepareattack(0, cvar("g_balance_electro_primary_refire")))
+                       if (weapon_prepareattack(0, (cvar("g_balance_electro_lightning") ? 0 : cvar("g_balance_electro_primary_refire"))))
                        {
                                if(cvar("g_balance_electro_lightning"))
                                {

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index abf1a39ef962d966bcd1b56482f14db7f38bbcbe..49e2cc47c96309f45b10b9bfe5006f8e52502b2f 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -256,7 +256,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);
@@ -268,7 +268,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);