X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fspawn.qc;h=23fc845ac75d3f35c9b0ad7e77ca1a9fa98e6057;hb=90e39049eaeafbbd25267d1dfcf08023734cf6b8;hp=cf23639e015b5276ee781229f98e0af1674c9d8a;hpb=03f978544a8b13a18cef1c7cc3dbcaba1c3aee4c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc
index cf23639e0..23fc845ac 100644
--- a/qcsrc/common/monsters/spawn.qc
+++ b/qcsrc/common/monsters/spawn.qc
@@ -1,16 +1,15 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../dpdefs/progsdefs.qh"
     #include "../util.qh"
     #include "all.qh"
     #include "sv_monsters.qh"
     #include "spawn.qh"
-    #include "../../server/autocvars.qh"
-    #include "../../server/defs.qh"
+    #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)
-{SELFPARAM();
+{
        float i;
 	entity e = spawn();
 
@@ -25,7 +24,7 @@ entity spawnmonster (string monster, float monster_id, entity spawnedby, entity
 	{
 		RandomSelection_Init();
 		for(i = MON_FIRST; i <= MON_LAST; ++i)
-			RandomSelection_Add(world, i, string_null, 1, 1);
+			RandomSelection_Add(NULL, i, string_null, 1, 1);
 
            monster_id = RandomSelection_chosen_float;
 	}
@@ -64,7 +63,7 @@ entity spawnmonster (string monster, float monster_id, entity spawnedby, entity
 	}
 
 	// Monster_Spawn checks if monster is valid
-	WITH(entity, self, e, Monster_Spawn(monster_id));
+	Monster_Spawn(e, monster_id);
 
 	return e;
 }