]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
and fix the hold primary => hold secondary => let go primary issue :)
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 18 Jul 2010 18:52:55 +0000 (21:52 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 18 Jul 2010 18:52:55 +0000 (21:52 +0300)
qcsrc/server/w_electro.qc

index cbd2b6f07326cc93e5c8b329b49802a6b9a09406..7f48f134c2c6821e9e3dd2df219d62e30c76d09c 100644 (file)
@@ -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);