From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 18 Jul 2010 22:39:03 +0000 (+0300)
Subject: stop the lg beam when you die :P
X-Git-Tag: xonotic-v0.1.0preview~423^2~43
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=3d36f5d15312c8a97480ca30e8a8695b41a1896c

stop the lg beam when you die :P
---

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 1959d9a983..62ae00893a 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -188,7 +188,7 @@ void W_Electro_Attack2()
 .float nextdamagethink;
 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 || self.owner.BUTTON_ATCK == 0)
+	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 || self.owner.deadflag != DEAD_NO)
 	{
 		remove(self);
 		return;
@@ -211,7 +211,7 @@ void lgbeam_think()
 // execute each frame to update the beam visuals, but only apply damage at intervals of "refire" to prevent massive hitsound spam
 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 || self.owner.BUTTON_ATCK == 0)
+	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 || self.owner.deadflag != DEAD_NO)
 	{
 		sound (self, CHAN_PROJECTILE, "sound/misc/null.wav", VOL_BASE, ATTN_NORM);
 		remove(self);