]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fixed spawner.qc having improper filename.
authorLyberta <lyberta@lyberta.net>
Wed, 8 Mar 2017 07:56:13 +0000 (10:56 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 8 Mar 2017 07:56:13 +0000 (10:56 +0300)
qcsrc/common/monsters/_mod.inc
qcsrc/common/monsters/spawner.qc [deleted file]
qcsrc/common/monsters/sv_spawner.qc [new file with mode: 0644]

index e7f1e9734d4269ce360bb65ebe2271b5c4a0ae08..4b6918c79bad4b0a1f292a1d98779aaf92c0e877 100644 (file)
@@ -2,10 +2,10 @@
 #include <common/monsters/all.qc>
 #ifdef SVQC
     #include <common/monsters/sv_monsters.qc>
+       #include <common/monsters/sv_spawner.qc>
 #endif
 #ifdef SVQC
     #include <common/monsters/sv_spawn.qc>
-       #include <common/monsters/spawner.qc>
 #endif
 
 #include <common/monsters/monster/_mod.inc>
diff --git a/qcsrc/common/monsters/spawner.qc b/qcsrc/common/monsters/spawner.qc
deleted file mode 100644 (file)
index 0b34d13..0000000
+++ /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 (file)
index 0000000..0b34d13
--- /dev/null
@@ -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;
+}