X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fspawn.qc;h=ebe8ba8e085349db82a39094816cff9130480b95;hb=71c012ba7810a42b948ef0b0db35ed2fed7eacb1;hp=e8dfdd58f951c85af22751e00cbd8361e25e5778;hpb=1f988ad58a9fb5cef7ed843ad839b23dd23f6dc9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc
index e8dfdd58f..ebe8ba8e0 100644
--- 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