Begin working on a new mage attack

[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 e8dfdd58f951c85af22751e00cbd8361e25e5778..ebe8ba8e085349db82a39094816cff9130480b95 100644 (file)
--- a/qcsrc/common/monsters/spawn.qc
+++ b/qcsrc/common/monsters/spawn.qc
@@ -1,4 +1,4 @@
-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)
 {
        // ensure spawnfunc database is initialized
        initialize_field_db();
@@ -30,24 +30,24 @@ entity spawnmonster (string monster, float mnster, entity spawnedby, entity own,
        }
                
        if(monster == "")
-       if(mnster)
-               monster = (get_monsterinfo(mnster)).netname;
+       if(monster_id)
+               monster = (get_monsterinfo(monster_id)).netname;
        
        e.realowner = spawnedby;
        
        if(moveflag)
                e.monster_moveflags = moveflag;
+               
+       if(e.team || !IS_PLAYER(spawnedby))
+               e.colormap = 1024;
+       else
+               e.colormap = spawnedby.colormap;
        
        if(IS_PLAYER(spawnedby))
        {
                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