Merge branch 'master' into 'terencehill/bot_waypoints'

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

diff --git a/qcsrc/common/monsters/sv_spawn.qc b/qcsrc/common/monsters/sv_spawn.qc
index 50373cc2a232b85e1a93e403482776e6a81e2ae2..d456282d429ee6fbc6c5113f90b7f57484b8fcff 100644 (file)
--- a/qcsrc/common/monsters/sv_spawn.qc
+++ b/qcsrc/common/monsters/sv_spawn.qc
@@ -8,42 +8,49 @@
     #include <server/autocvars.qh>
     #include <server/defs.qh>
 #endif
-entity spawnmonster (string monster, float monster_id, entity spawnedby, entity own, vector orig, float respwn, float invincible, float moveflag)
+entity spawnmonster (entity e, string monster, int monster_id, entity spawnedby, entity own, vector orig, bool respwn, bool removeifinvalid, int moveflag)
 {
-       float i;
-       entity e = spawn();
-
        e.spawnflags = MONSTERFLAG_SPAWNED;
 
        if(!respwn) { e.spawnflags |= MONSTERFLAG_NORESPAWN; }
-       if(invincible) { e.spawnflags |= MONSTERFLAG_INVINCIBLE; }
+       //if(invincible) { e.spawnflags |= MONSTERFLAG_INVINCIBLE; }
 
        setorigin(e, orig);
+       bool allow_any = boolean(monster == "anyrandom");
 
-       if(monster == "random")
+       if(monster == "random" || allow_any)
        {
                RandomSelection_Init();
-               for(i = MON_FIRST; i <= MON_LAST; ++i)
-                       RandomSelection_Add(NULL, i, string_null, 1, 1);
+               FOREACH(Monsters, it != MON_Null && (allow_any || !(it.spawnflags & MON_FLAG_HIDDEN)) && !(it.spawnflags & MONSTER_TYPE_PASSIVE),
+               {
+                       RandomSelection_AddEnt(it, 1, 1);
+               });
 
-           monster_id = RandomSelection_chosen_float;
+               monster_id = RandomSelection_chosen_ent.monsterid;
        }
        else if(monster != "")
        {
-               float found = 0;
-               entity mon;
-               for(i = MON_FIRST; i <= MON_LAST; ++i)
+               bool found = false;
+               FOREACH(Monsters, it != MON_Null,
                {
-                       mon = get_monsterinfo(i);
-                       if(mon.netname == monster)
+                       if(it.netname == monster)
                        {
                                found = true;
-                               monster_id = mon.monsterid; // we have the monster, old monster id is no longer required
+                               monster_id = it.monsterid; // we have the monster, old monster id is no longer required
                                break;
                        }
+               });
+
+               if(!found && !monster_id)
+               {
+                       if(removeifinvalid)
+                       {
+                               delete(e);
+                               return NULL; // no good
+                       }
+                       else
+                               monster_id = MON_FIRST;
                }
-               if(!found)
-                       monster_id = ((monster_id > 0) ? monster_id : MON_FIRST);
        }
 
        e.realowner = spawnedby;
@@ -63,7 +70,11 @@ entity spawnmonster (string monster, float monster_id, entity spawnedby, entity
        }
 
        // Monster_Spawn checks if monster is valid
-       Monster_Spawn(e, monster_id);
+       if(!Monster_Spawn(e, false, monster_id))
+       {
+               delete(e);
+               return NULL; // remove even if told not to, as we didn't spawn any kind of monster
+       }
 
        return e;
 }