From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 22 Jul 2010 11:54:26 +0000 (+0300)
Subject: refire 0 on gauntlet and electro lightning
X-Git-Tag: xonotic-v0.1.0preview~423^2~18^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6eff88c18c7385de1b255915797a2b35bb207bd0;p=xonotic%2Fxonotic-data.pk3dir.git

refire 0 on gauntlet and electro lightning
---

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 8fd66038e..ef478e2b2 100644
--- 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 abf1a39ef..49e2cc47c 100644
--- 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);