From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 18 Jul 2010 18:52:55 +0000 (+0300)
Subject: and fix the hold primary => hold secondary => let go primary issue :)
X-Git-Tag: xonotic-v0.1.0preview~423^2~52
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c876a36412a41fa2cff5b5dceeee8493115cd9e6;p=xonotic%2Fxonotic-data.pk3dir.git

and fix the hold primary => hold secondary => let go primary issue :)
---

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index cbd2b6f07..7f48f134c 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -187,7 +187,7 @@ void W_Electro_Attack2()
 .entity lgbeam, exteriorlgbeam;
 void lgbeam_think()
 {
-	if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.lgbeam)
+	if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.lgbeam || self.owner.BUTTON_ATCK == 0)
 	{
 		remove(self);
 		return;
@@ -209,7 +209,7 @@ void lgbeam_think()
 
 void exteriorlgbeam_think()
 {
-	if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.exteriorlgbeam)
+	if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.exteriorlgbeam || self.owner.BUTTON_ATCK == 0)
 	{
 		sound (self, CHAN_PROJECTILE, "sound/misc/null.wav", VOL_BASE, ATTN_NORM);
 		remove(self);