Replace enforcer model with e-wheel

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / monsters / monster / spawner.qc

diff --git a/qcsrc/server/monsters/monster/spawner.qc b/qcsrc/server/monsters/monster/spawner.qc
index d625bd9f9f9a815af9f4c1a83bd83635ae78c93b..76cc94f22d0ab985e6ef6e74aca625ade8058bed 100644 (file)
--- a/qcsrc/server/monsters/monster/spawner.qc
+++ b/qcsrc/server/monsters/monster/spawner.qc
@@ -73,13 +73,6 @@ void spawner_die ()
        monster_hook_death(); // for post-death mods
 }
 
-void spawner_recount()
-{
-       self.spawner_monstercount = 0;
-       self.think = spawner_think;
-       self.nextthink = time;
-}
-
 void spawner_think() 
 {
        float finished = FALSE;
@@ -87,9 +80,7 @@ void spawner_think()
        
        if(self.spawner_monstercount >= autocvar_g_monster_spawner_maxmobs)
        {
-               self.think = spawner_recount;
-               self.nextthink = time + 10 + random() * 4;
-               return;
+               self.nextthink = time + 5;
        }
 
        if (self.spawner_monstercount <= autocvar_g_monster_spawner_maxmobs)
@@ -100,10 +91,7 @@ void spawner_think()
        
        self.nextthink = time + 1;
 
-       if(self.spawner_monstercount <= autocvar_g_monster_spawner_maxmobs)
-               self.nextthink = time + 0.1;
-       
-       if not(finished) 
+       if(self.spawner_monstercount <= autocvar_g_monster_spawner_maxmobs || !finished)
                self.nextthink = time + 0.1;
 }
 
@@ -135,11 +123,7 @@ modeldisabled="models/containers/crate01.md3"
 */
 void spawnfunc_monster_spawner() 
 {
-       if not(autocvar_g_monster_spawner) 
-       {
-               remove(self);
-               return;
-       }
+       if not(autocvar_g_monster_spawner) { remove(self); return; }
        
        self.monster_spawnfunc = spawnfunc_monster_spawner;