X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fspawn.qc;h=70459263f1087da264e10fe71d95b218bbf59279;hb=068324d293df795dbc41de75f38256b8c6c35607;hp=4a84f943584499708acab79e9a387ab8909f7dc5;hpb=86c9dc7c3696c329496b06375c1e79fb407401ce;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc
index 4a84f9435..70459263f 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();
 
@@ -62,12 +61,9 @@ entity spawnmonster (string monster, float monster_id, entity spawnedby, entity
 
 		e.angles_y = spawnedby.angles_y;
 	}
-	
+
 	// Monster_Spawn checks if monster is valid
-	entity oldself = self;
-	self = e;
-	Monster_Spawn(monster_id);
-	self = oldself;
+	Monster_Spawn(e, monster_id);
 
 	return e;
 }