]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix dead monsters not disappearing
authorMario <mario.mario@y7mail.com>
Fri, 19 Apr 2013 02:39:38 +0000 (12:39 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 19 Apr 2013 02:39:38 +0000 (12:39 +1000)
qcsrc/client/monsters.qc
qcsrc/server/command/cmd.qc
qcsrc/server/monsters/lib/monsters.qc

index 58585a8b6348749a6dc0f685336cb5a680e58ac9..d5b7ca7f1875c8df2b559b1f88213ee4422b0dac 100644 (file)
@@ -351,7 +351,7 @@ void ent_monster()
                
                _tmp = ReadByte();
                if(_tmp == 4) // respawning
-                       self.alpha = 0;
+                       setmodel(self, "null");
                
                _tmp = ReadByte();
                
index 35bb12cbb7a086ecc255f0a9b8d0c1507d25ff4c..ada0dd8002c0369452ddc1821e92c02216e80363 100644 (file)
@@ -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"));
index d99b415ed45da39897ba613c6ad6c96ca083c0fc..3ed9b2072d713ea604cd42d24efd55913408ed6e 100644 (file)
@@ -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;
        }