Merge branch 'Lyberta/_mod_autogen_fix' into 'master'

Fixed generation of _mod files

See merge request !420

diff --git a/qcsrc/common/_mod.qh b/qcsrc/common/_mod.qh
index e32b270e08a6c6294ec201897c36a7df2ea2e18d..3e16f9cbe8e4c024b45dc8e3f252f6e7b42fff5e 100644 (file)
--- a/qcsrc/common/_mod.qh
+++ b/qcsrc/common/_mod.qh
@@ -11,3 +11,4 @@
 #include <common/t_items.qh>
 #include <common/util.qh>
 #include <common/viewloc.qh>
+#include <common/wepent.qh>

diff --git a/qcsrc/common/monsters/_mod.inc b/qcsrc/common/monsters/_mod.inc
index e7f1e9734d4269ce360bb65ebe2271b5c4a0ae08..4b6918c79bad4b0a1f292a1d98779aaf92c0e877 100644 (file)
--- a/qcsrc/common/monsters/_mod.inc
+++ b/qcsrc/common/monsters/_mod.inc
@@ -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
--- 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 (file)
index 0000000..0b34d13
--- /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;
+}

diff --git a/qcsrc/common/mutators/mutator/walljump/_mod.inc b/qcsrc/common/mutators/mutator/walljump/_mod.inc
index 4f879c851e099dc90055947d384e36a4509e28a4..a9e33b9e110648d9bed339e6ff131a0df7c4b78e 100644 (file)
--- a/qcsrc/common/mutators/mutator/walljump/_mod.inc
+++ b/qcsrc/common/mutators/mutator/walljump/_mod.inc
@@ -1,4 +1,2 @@
 // generated file; do not modify
-#ifdef GAMEQC
-    #include <common/mutators/mutator/walljump/walljump.qc>
-#endif
+#include <common/mutators/mutator/walljump/walljump.qc>

diff --git a/qcsrc/common/mutators/mutator/walljump/_mod.qh b/qcsrc/common/mutators/mutator/walljump/_mod.qh
index 59ab51518ee1e393d9ee414010d7c017c29d9a03..18e4c63f4886a88bb69b5398ede6461f5f3c98f8 100644 (file)
--- a/qcsrc/common/mutators/mutator/walljump/_mod.qh
+++ b/qcsrc/common/mutators/mutator/walljump/_mod.qh
@@ -1,4 +1,2 @@
 // generated file; do not modify
-#ifdef GAMEQC
-       #include <common/mutators/mutator/walljump/walljump.qh>
-#endif
+#include <common/mutators/mutator/walljump/walljump.qh>

diff --git a/qcsrc/common/mutators/mutator/walljump/walljump.qc b/qcsrc/common/mutators/mutator/walljump/walljump.qc
index 96b81a561544d92f1dedf42bef2cc4a2cd25516e..95a52185b849fd5c4a475b642c78d0148905a63c 100644 (file)
--- a/qcsrc/common/mutators/mutator/walljump/walljump.qc
+++ b/qcsrc/common/mutators/mutator/walljump/walljump.qc
@@ -1,5 +1,6 @@
 #include "walljump.qh"
 
+#ifdef GAMEQC
 #ifdef CSQC
 REGISTER_MUTATOR(walljump, true);
 #elif defined(SVQC)
@@ -68,3 +69,5 @@ MUTATOR_HOOKFUNCTION(walljump, PlayerJump)
                }
        }
 }
+
+#endif

diff --git a/qcsrc/lib/matrix/_mod.inc b/qcsrc/lib/matrix/_mod.inc
index d68dc7d968ee14850297dc46b5ef744c76761a73..4854f092a0aba4d21b65675082913140dfb38d39 100644 (file)
--- a/qcsrc/lib/matrix/_mod.inc
+++ b/qcsrc/lib/matrix/_mod.inc
@@ -1,5 +1,3 @@
 // generated file; do not modify
-#if XONOTIC
-       #include <lib/matrix/command.qc>
-#endif
+#include <lib/matrix/command.qc>
 #include <lib/matrix/matrix.qc>

diff --git a/qcsrc/lib/matrix/_mod.qh b/qcsrc/lib/matrix/_mod.qh
index c351afe8f7c91f41123a4d68effd731f7f79659a..965812297204137ccb73c865636c0784ca5002f3 100644 (file)
--- a/qcsrc/lib/matrix/_mod.qh
+++ b/qcsrc/lib/matrix/_mod.qh
@@ -1,5 +1,3 @@
 // generated file; do not modify
-#if XONOTIC
-       #include <lib/matrix/command.qh>
-#endif
+#include <lib/matrix/command.qh>
 #include <lib/matrix/matrix.qh>