From: Lyberta Date: Wed, 8 Mar 2017 07:56:13 +0000 (+0300) Subject: Fixed spawner.qc having improper filename. X-Git-Tag: xonotic-v0.8.2~77^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=add3116cfe9c5d1bfaec0e88b135e11c979b5edf;p=xonotic%2Fxonotic-data.pk3dir.git Fixed spawner.qc having improper filename. --- diff --git a/qcsrc/common/monsters/_mod.inc b/qcsrc/common/monsters/_mod.inc index e7f1e9734..4b6918c79 100644 --- a/qcsrc/common/monsters/_mod.inc +++ b/qcsrc/common/monsters/_mod.inc @@ -2,10 +2,10 @@ #include #ifdef SVQC #include + #include #endif #ifdef SVQC #include - #include #endif #include diff --git a/qcsrc/common/monsters/spawner.qc b/qcsrc/common/monsters/spawner.qc deleted file mode 100644 index 0b34d13e6..000000000 --- a/qcsrc/common/monsters/spawner.qc +++ /dev/null @@ -1,26 +0,0 @@ -#include "sv_spawn.qh" - -void spawner_use(entity this, entity actor, entity trigger) -{ - int moncount = 0; - IL_EACH(g_monsters, it.realowner == this, - { - ++moncount; - }); - - if(moncount >= this.count) - return; - - entity e = spawn(); - e.noalign = this.noalign; - e.angles = this.angles; - e.monster_skill = this.monster_skill; - e = spawnmonster(e, this.spawnmob, 0, this, this, this.origin, false, true, this.monster_moveflags); -} - -spawnfunc(monster_spawner) -{ - if(!autocvar_g_monsters || !this.spawnmob || this.spawnmob == "") { delete(this); return; } - - this.use = spawner_use; -} diff --git a/qcsrc/common/monsters/sv_spawner.qc b/qcsrc/common/monsters/sv_spawner.qc new file mode 100644 index 000000000..0b34d13e6 --- /dev/null +++ b/qcsrc/common/monsters/sv_spawner.qc @@ -0,0 +1,26 @@ +#include "sv_spawn.qh" + +void spawner_use(entity this, entity actor, entity trigger) +{ + int moncount = 0; + IL_EACH(g_monsters, it.realowner == this, + { + ++moncount; + }); + + if(moncount >= this.count) + return; + + entity e = spawn(); + e.noalign = this.noalign; + e.angles = this.angles; + e.monster_skill = this.monster_skill; + e = spawnmonster(e, this.spawnmob, 0, this, this, this.origin, false, true, this.monster_moveflags); +} + +spawnfunc(monster_spawner) +{ + if(!autocvar_g_monsters || !this.spawnmob || this.spawnmob == "") { delete(this); return; } + + this.use = spawner_use; +}