X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fspawn.qc;h=5e1af3df7d305198f93ee75bf27875a78816454b;hb=847371860eeb17f6a51aa1fa532aa997cb2d760b;hp=2ed974b28ecb6ff077c455d70545583ce669eb0d;hpb=5b22584122d4354ab7819853d0fa5219d14d832e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc index 2ed974b28..5e1af3df7 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 + #include #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; }