X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fsv_spawn.qc;h=d456282d429ee6fbc6c5113f90b7f57484b8fcff;hp=9e87e488e624323d336ee9cfcedb36ec651b1ba9;hb=bc50c2d7ca3e0a44ed1712400ef8e170e6df8210;hpb=f366b93e1d9e8ebdff81c9277f9958178dcb38d0

diff --git a/qcsrc/common/monsters/sv_spawn.qc b/qcsrc/common/monsters/sv_spawn.qc
index 9e87e488e..d456282d4 100644
--- a/qcsrc/common/monsters/sv_spawn.qc
+++ b/qcsrc/common/monsters/sv_spawn.qc
@@ -8,21 +8,20 @@
     #include <server/autocvars.qh>
     #include <server/defs.qh>
 #endif
-entity spawnmonster (string monster, int monster_id, entity spawnedby, entity own, vector orig, bool respwn, bool invincible, int moveflag)
+entity spawnmonster (entity e, string monster, int monster_id, entity spawnedby, entity own, vector orig, bool respwn, bool removeifinvalid, int moveflag)
 {
-	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();	
-		FOREACH(Monsters, it != MON_Null,
+		RandomSelection_Init();
+		FOREACH(Monsters, it != MON_Null && (allow_any || !(it.spawnflags & MON_FLAG_HIDDEN)) && !(it.spawnflags & MONSTER_TYPE_PASSIVE),
 		{
 			RandomSelection_AddEnt(it, 1, 1);
 		});
@@ -41,8 +40,17 @@ entity spawnmonster (string monster, int monster_id, entity spawnedby, entity ow
 				break;
 			}
 		});
-		if(!found)
-			monster_id = ((monster_id > 0) ? monster_id : MON_FIRST);
+
+		if(!found && !monster_id)
+		{
+			if(removeifinvalid)
+			{
+				delete(e);
+				return NULL; // no good
+			}
+			else
+				monster_id = MON_FIRST;
+		}
 	}
 
 	e.realowner = spawnedby;
@@ -62,7 +70,11 @@ entity spawnmonster (string monster, int monster_id, entity spawnedby, entity ow
 	}
 
 	// 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;
 }