From: Mario <mario.mario@y7mail.com>
Date: Fri, 19 Apr 2013 02:39:38 +0000 (+1000)
Subject: Fix dead monsters not disappearing
X-Git-Tag: xonotic-v0.8.0~241^2^2~339
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a78b41d6ace1cab68776d94fb83c6fc8adb910b0;p=xonotic%2Fxonotic-data.pk3dir.git

Fix dead monsters not disappearing
---

diff --git a/qcsrc/client/monsters.qc b/qcsrc/client/monsters.qc
index 58585a8b6..d5b7ca7f1 100644
--- a/qcsrc/client/monsters.qc
+++ b/qcsrc/client/monsters.qc
@@ -351,7 +351,7 @@ void ent_monster()
 		
 		_tmp = ReadByte();
 		if(_tmp == 4) // respawning
-			self.alpha = 0;
+			setmodel(self, "null");
 		
 		_tmp = ReadByte();
 		
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 35bb12cbb..ada0dd800 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -292,7 +292,7 @@ void ClientCommand_mobspawn(float request, float argc)
 				makevectors(self.v_angle);
 				WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 150, MOVE_NORMAL, self);
 			
-				e = spawnmonster(tospawn, self, self, trace_endpos, FALSE, moveflag);
+				e = spawnmonster(tospawn, self, self, trace_endpos, TRUE, moveflag);
 				if(mname) e.netname = strzone(mname);
 			
 				sprint(self, strcat("Spawned 1 ", tospawn, "\n"));
diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index d99b415ed..3ed9b2072 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -304,6 +304,7 @@ void Monster_Fade ()
 		self.health = self.max_health; // TODO: check if resetting to max_health is wise here
 		
 		self.SendFlags |= MSF_MOVE;
+		self.SendFlags |= MSF_STATUS;
 		
 		return;
 	}