From: FruitieX <fruitiex@gmail.com>
Date: Wed, 24 Nov 2010 20:35:45 +0000 (+0200)
Subject: remove electro beam if you get frozen
X-Git-Tag: xonotic-v0.1.0preview~86^2~2^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=675731cad0d91115d0293a3aa726729c6503191b;p=xonotic%2Fxonotic-data.pk3dir.git

remove electro beam if you get frozen
---

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index f64e4ca8d..59eb4382b 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -231,7 +231,7 @@ void lgbeam_think()
 		remove(self);
 		return;
 	}
-	if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK)
+	if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK || (g_freezetag && self.freezetag_frozen)
 	{
 		if(self == self.owner.lgbeam)
 			self.owner.lgbeam = world;