Disable extra monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / sv_monsters.qc

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 12f9acb4f8524181764c39a5639807265ff11621..bf56a6245db58b405eebea1c40fba63c068826cb 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -703,6 +703,24 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
        monster_checkattack(self, self.enemy);
 }
 
+void monster_remove(entity mon)
+{
+       if not(mon)
+               return; // nothing to remove
+               
+       pointparticles(particleeffectnum("item_pickup"), mon.origin, '0 0 0', 1);
+               
+       if(mon.weaponentity)
+               remove(mon.weaponentity);
+                                       
+       if(mon.iceblock)
+               remove(mon.iceblock);
+                                       
+       WaypointSprite_Kill(mon.sprite);
+                                       
+       remove(mon);
+}
+
 void monster_dead_think()
 {
        self.nextthink = time + self.ticrate;
@@ -961,6 +979,12 @@ float monster_initialize(float mon_id, float nodrop)
                return FALSE;
 
        entity mon = get_monsterinfo(mon_id);
+       
+       if(mon.spawnflags & MON_FLAG_MUTATORBLOCKED)
+       {
+               dprint("Attempted to spawn a mutator-blocked monster rejected");
+               return FALSE;
+       }
 
        // support for quake style removing monsters based on skill
        if(monster_skill <= 1) if(self.spawnflags & MONSTERSKILL_NOTEASY) { return FALSE; }