From: Mario <mario@smbclan.net>
Date: Sat, 31 Aug 2019 03:21:36 +0000 (+1000)
Subject: Make genmod.sh output compile again
X-Git-Tag: xonotic-v0.8.5~1339
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b1a424c6c61fba8a6bb65f2c97825d4e24d33849;p=xonotic%2Fxonotic-data.pk3dir.git

Make genmod.sh output compile again
---

diff --git a/qcsrc/common/gamemodes/gamemode/ctf/_mod.inc b/qcsrc/common/gamemodes/gamemode/ctf/_mod.inc
index c6d756fbb..663a5f829 100644
--- a/qcsrc/common/gamemodes/gamemode/ctf/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/ctf/_mod.inc
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/gamemodes/gamemode/ctf/ctf.qc>
 #ifdef CSQC
     #include <common/gamemodes/gamemode/ctf/cl_ctf.qc>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/ctf/ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/ctf.qc
new file mode 100644
index 000000000..a6157c588
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/ctf/ctf.qc
@@ -0,0 +1 @@
+#include "ctf.qh"
diff --git a/qcsrc/common/gamemodes/gamemode/domination/_mod.inc b/qcsrc/common/gamemodes/gamemode/domination/_mod.inc
index ccaa150df..a35415a8f 100644
--- a/qcsrc/common/gamemodes/gamemode/domination/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/domination/_mod.inc
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/gamemodes/gamemode/domination/domination.qc>
 #ifdef CSQC
     #include <common/gamemodes/gamemode/domination/cl_domination.qc>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/domination/_mod.qh b/qcsrc/common/gamemodes/gamemode/domination/_mod.qh
index b48a0a914..869273e85 100644
--- a/qcsrc/common/gamemodes/gamemode/domination/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/domination/_mod.qh
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/gamemodes/gamemode/domination/domination.qh>
 #ifdef CSQC
     #include <common/gamemodes/gamemode/domination/cl_domination.qh>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/domination/domination.qc b/qcsrc/common/gamemodes/gamemode/domination/domination.qc
new file mode 100644
index 000000000..3e5bebafb
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/domination/domination.qc
@@ -0,0 +1 @@
+#include "domination.qh"
diff --git a/qcsrc/common/gamemodes/gamemode/domination/domination.qh b/qcsrc/common/gamemodes/gamemode/domination/domination.qh
new file mode 100644
index 000000000..6f70f09be
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/domination/domination.qh
@@ -0,0 +1 @@
+#pragma once
diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/_mod.inc b/qcsrc/common/gamemodes/gamemode/keepaway/_mod.inc
index 2ce6f4493..42fb4b0e2 100644
--- a/qcsrc/common/gamemodes/gamemode/keepaway/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/keepaway/_mod.inc
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/gamemodes/gamemode/keepaway/keepaway.qc>
 #ifdef CSQC
     #include <common/gamemodes/gamemode/keepaway/cl_keepaway.qc>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh b/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh
index 8536675f3..93eaf396c 100644
--- a/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/keepaway/_mod.qh
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/gamemodes/gamemode/keepaway/keepaway.qh>
 #ifdef CSQC
     #include <common/gamemodes/gamemode/keepaway/cl_keepaway.qh>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc b/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc
new file mode 100644
index 000000000..fe03dc9a9
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc
@@ -0,0 +1 @@
+#include "keepaway.qh"
diff --git a/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qh b/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qh
new file mode 100644
index 000000000..6f70f09be
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qh
@@ -0,0 +1 @@
+#pragma once
diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc
index 14802494b..52b5f0df8 100644
--- a/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.inc
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/gamemodes/gamemode/keyhunt/keyhunt.qc>
 #ifdef CSQC
     #include <common/gamemodes/gamemode/keyhunt/cl_keyhunt.qc>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh
index defda7497..46f35788e 100644
--- a/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/_mod.qh
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/gamemodes/gamemode/keyhunt/keyhunt.qh>
 #ifdef CSQC
     #include <common/gamemodes/gamemode/keyhunt/cl_keyhunt.qh>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qc
new file mode 100644
index 000000000..724a0e6d4
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qc
@@ -0,0 +1 @@
+#include "keyhunt.qh"
diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh b/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh
new file mode 100644
index 000000000..6f70f09be
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh
@@ -0,0 +1 @@
+#pragma once
diff --git a/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc b/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc
index b229dcdf5..4e9fd6b10 100644
--- a/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/_mod.inc
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/gamemodes/gamemode/nexball/nexball.qc>
 #ifdef CSQC
     #include <common/gamemodes/gamemode/nexball/cl_nexball.qc>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh b/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh
index 0a3d1e238..657280e6a 100644
--- a/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/nexball/_mod.qh
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/gamemodes/gamemode/nexball/nexball.qh>
 #ifdef CSQC
     #include <common/gamemodes/gamemode/nexball/cl_nexball.qh>
 #endif
diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
new file mode 100644
index 000000000..4b49dba3e
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
@@ -0,0 +1 @@
+#include "nexball.qh"
diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qh b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qh
new file mode 100644
index 000000000..6f70f09be
--- /dev/null
+++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qh
@@ -0,0 +1 @@
+#pragma once
diff --git a/qcsrc/common/mutators/mutator/dodging/_mod.inc b/qcsrc/common/mutators/mutator/dodging/_mod.inc
index 99b822d42..05ce178bd 100644
--- a/qcsrc/common/mutators/mutator/dodging/_mod.inc
+++ b/qcsrc/common/mutators/mutator/dodging/_mod.inc
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/mutators/mutator/dodging/dodging.qc>
 #ifdef CSQC
     #include <common/mutators/mutator/dodging/cl_dodging.qc>
 #endif
diff --git a/qcsrc/common/mutators/mutator/dodging/_mod.qh b/qcsrc/common/mutators/mutator/dodging/_mod.qh
index d2c0d05c7..3b106c653 100644
--- a/qcsrc/common/mutators/mutator/dodging/_mod.qh
+++ b/qcsrc/common/mutators/mutator/dodging/_mod.qh
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/mutators/mutator/dodging/dodging.qh>
 #ifdef CSQC
     #include <common/mutators/mutator/dodging/cl_dodging.qh>
 #endif
diff --git a/qcsrc/common/mutators/mutator/dodging/dodging.qc b/qcsrc/common/mutators/mutator/dodging/dodging.qc
new file mode 100644
index 000000000..9e7ea204f
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/dodging/dodging.qc
@@ -0,0 +1 @@
+#include "dodging.qh"
diff --git a/qcsrc/common/mutators/mutator/dodging/dodging.qh b/qcsrc/common/mutators/mutator/dodging/dodging.qh
new file mode 100644
index 000000000..6f70f09be
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/dodging/dodging.qh
@@ -0,0 +1 @@
+#pragma once
diff --git a/qcsrc/common/mutators/mutator/overkill/_mod.inc b/qcsrc/common/mutators/mutator/overkill/_mod.inc
index 017cc2082..227be4626 100644
--- a/qcsrc/common/mutators/mutator/overkill/_mod.inc
+++ b/qcsrc/common/mutators/mutator/overkill/_mod.inc
@@ -1,15 +1,16 @@
 // generated file; do not modify
+#include <common/mutators/mutator/overkill/okhmg.qc>
+#include <common/mutators/mutator/overkill/okmachinegun.qc>
+#include <common/mutators/mutator/overkill/oknex.qc>
+#include <common/mutators/mutator/overkill/okrpc.qc>
+#include <common/mutators/mutator/overkill/okshotgun.qc>
+#include <common/mutators/mutator/overkill/overkill.qc>
 #ifdef CSQC
     #include <common/mutators/mutator/overkill/cl_overkill.qc>
 #endif
 #ifdef SVQC
     #include <common/mutators/mutator/overkill/sv_overkill.qc>
 #endif
-#include <common/mutators/mutator/overkill/okhmg.qc>
-#include <common/mutators/mutator/overkill/okmachinegun.qc>
-#include <common/mutators/mutator/overkill/oknex.qc>
-#include <common/mutators/mutator/overkill/okrpc.qc>
-#include <common/mutators/mutator/overkill/okshotgun.qc>
 #ifdef SVQC
     #include <common/mutators/mutator/overkill/sv_weapons.qc>
 #endif
diff --git a/qcsrc/common/mutators/mutator/overkill/_mod.qh b/qcsrc/common/mutators/mutator/overkill/_mod.qh
index 7731f17e1..dc2bb0a5b 100644
--- a/qcsrc/common/mutators/mutator/overkill/_mod.qh
+++ b/qcsrc/common/mutators/mutator/overkill/_mod.qh
@@ -1,12 +1,13 @@
 // generated file; do not modify
+#include <common/mutators/mutator/overkill/okhmg.qh>
+#include <common/mutators/mutator/overkill/okmachinegun.qh>
+#include <common/mutators/mutator/overkill/oknex.qh>
+#include <common/mutators/mutator/overkill/okrpc.qh>
+#include <common/mutators/mutator/overkill/okshotgun.qh>
+#include <common/mutators/mutator/overkill/overkill.qh>
 #ifdef CSQC
     #include <common/mutators/mutator/overkill/cl_overkill.qh>
 #endif
 #ifdef SVQC
     #include <common/mutators/mutator/overkill/sv_overkill.qh>
 #endif
-#include <common/mutators/mutator/overkill/okhmg.qh>
-#include <common/mutators/mutator/overkill/okmachinegun.qh>
-#include <common/mutators/mutator/overkill/oknex.qh>
-#include <common/mutators/mutator/overkill/okrpc.qh>
-#include <common/mutators/mutator/overkill/okshotgun.qh>
diff --git a/qcsrc/common/mutators/mutator/overkill/overkill.qc b/qcsrc/common/mutators/mutator/overkill/overkill.qc
new file mode 100644
index 000000000..3cb64ce92
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/overkill/overkill.qc
@@ -0,0 +1 @@
+#include "overkill.qh"
diff --git a/qcsrc/common/mutators/mutator/overkill/overkill.qh b/qcsrc/common/mutators/mutator/overkill/overkill.qh
new file mode 100644
index 000000000..3f59c932d
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/overkill/overkill.qh
@@ -0,0 +1,2 @@
+#pragma once
+
diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.inc b/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.inc
index 46496895a..e8306ea08 100644
--- a/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.inc
+++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.inc
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc>
 #ifdef CSQC
     #include <common/mutators/mutator/spawn_near_teammate/cl_spawn_near_teammate.qc>
 #endif
diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.qh b/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.qh
index c4cfe5ada..ea2fd49e6 100644
--- a/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.qh
+++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/_mod.qh
@@ -1,4 +1,5 @@
 // generated file; do not modify
+#include <common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh>
 #ifdef CSQC
     #include <common/mutators/mutator/spawn_near_teammate/cl_spawn_near_teammate.qh>
 #endif
diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc
new file mode 100644
index 000000000..745374770
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qc
@@ -0,0 +1 @@
+#include "spawn_near_teammate.qh"
diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh
new file mode 100644
index 000000000..3f59c932d
--- /dev/null
+++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh
@@ -0,0 +1,2 @@
+#pragma once
+
diff --git a/qcsrc/menu/xonotic/_mod.inc b/qcsrc/menu/xonotic/_mod.inc
index 00a9e5403..3f324ba39 100644
--- a/qcsrc/menu/xonotic/_mod.inc
+++ b/qcsrc/menu/xonotic/_mod.inc
@@ -59,6 +59,7 @@
 #include <menu/xonotic/dialog_sandboxtools.qc>
 #include <menu/xonotic/dialog_settings.qc>
 #include <menu/xonotic/dialog_settings_audio.qc>
+#include <menu/xonotic/dialog_settings_bindings_reset.qc>
 #include <menu/xonotic/dialog_settings_effects.qc>
 #include <menu/xonotic/dialog_settings_game.qc>
 #include <menu/xonotic/dialog_settings_game_crosshair.qc>
@@ -70,7 +71,6 @@
 #include <menu/xonotic/dialog_settings_game_weapons.qc>
 #include <menu/xonotic/dialog_settings_input.qc>
 #include <menu/xonotic/dialog_settings_input_userbind.qc>
-#include <menu/xonotic/dialog_settings_bindings_reset.qc>
 #include <menu/xonotic/dialog_settings_misc.qc>
 #include <menu/xonotic/dialog_settings_misc_cvars.qc>
 #include <menu/xonotic/dialog_settings_misc_reset.qc>
diff --git a/qcsrc/menu/xonotic/_mod.qh b/qcsrc/menu/xonotic/_mod.qh
index 5d72a5617..1b3e09081 100644
--- a/qcsrc/menu/xonotic/_mod.qh
+++ b/qcsrc/menu/xonotic/_mod.qh
@@ -59,6 +59,7 @@
 #include <menu/xonotic/dialog_sandboxtools.qh>
 #include <menu/xonotic/dialog_settings.qh>
 #include <menu/xonotic/dialog_settings_audio.qh>
+#include <menu/xonotic/dialog_settings_bindings_reset.qh>
 #include <menu/xonotic/dialog_settings_effects.qh>
 #include <menu/xonotic/dialog_settings_game.qh>
 #include <menu/xonotic/dialog_settings_game_crosshair.qh>
@@ -70,7 +71,6 @@
 #include <menu/xonotic/dialog_settings_game_weapons.qh>
 #include <menu/xonotic/dialog_settings_input.qh>
 #include <menu/xonotic/dialog_settings_input_userbind.qh>
-#include <menu/xonotic/dialog_settings_bindings_reset.qh>
 #include <menu/xonotic/dialog_settings_misc.qh>
 #include <menu/xonotic/dialog_settings_misc_cvars.qh>
 #include <menu/xonotic/dialog_settings_misc_reset.qh>