Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc
index 95e0261aeb511687fe40ae57497945b2a10eaff8..61bf56e320ed7bf9a06ec501203004ed615af44d 100644 (file)
--- a/qcsrc/common/monsters/spawn.qc
+++ b/qcsrc/common/monsters/spawn.qc
@@ -1,16 +1,13 @@
-entity spawnmonster (string monster, float mnster, entity spawnedby, entity own, vector orig, float respwn, float moveflag)
+entity spawnmonster (string monster, float monster_id, entity spawnedby, entity own, vector orig, float respwn, float moveflag)
 {
-       if(!spawncode_first_load)
-       {
-               initialize_field_db();
-               spawncode_first_load = TRUE;
-       }
+       // ensure spawnfunc database is initialized
+       initialize_field_db();
        
        entity e = spawn();
        
        e.spawnflags = MONSTERFLAG_SPAWNED;
        
-       if not(respwn)
+       if(!respwn)
                e.spawnflags |= MONSTERFLAG_NORESPAWN;
        
        setorigin(e, orig);
@@ -28,13 +25,13 @@ entity spawnmonster (string monster, float mnster, entity spawnedby, entity own,
                                break;
                        }
                }
-               if not(found)
+               if(!found)
                        monster = (get_monsterinfo(MON_FIRST)).netname;
        }
                
        if(monster == "")
-       if(mnster)
-               monster = (get_monsterinfo(mnster)).netname;
+       if(monster_id)
+               monster = (get_monsterinfo(monster_id)).netname;
        
        e.realowner = spawnedby;
        
@@ -46,11 +43,6 @@ entity spawnmonster (string monster, float mnster, entity spawnedby, entity own,
                if(teamplay && autocvar_g_monsters_teams)
                        e.team = spawnedby.team; // colors handled in spawn code
                        
-               if(e.team)
-                       e.colormap = 1024;
-               else
-                       e.colormap = spawnedby.colormap;
-                       
                if(autocvar_g_monsters_owners)
                        e.monster_owner = own; // using .owner makes the monster non-solid for its master