Move mod directory below qcsrc

diff --git a/mod/client/main.qc b/mod/client/main.qc
deleted file mode 100644 (file)
index d84239c..0000000
--- a/mod/client/main.qc
+++ /dev/null
@@ -1,9 +0,0 @@
-REGISTER_MUTATOR(mutator_mod, cvar("g_mod"));
-
-MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsString) {
-    ret_string = strcat(ret_string, ":mod");
-}
-
-MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsPrettyString) {
-    ret_string = strcat(ret_string, ", Mod");
-}

diff --git a/mod/client/progs.inc b/mod/client/progs.inc
deleted file mode 100644 (file)
index ae91a9e..0000000
--- a/mod/client/progs.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#if BUILD_MOD
-#include "main.qc"
-#endif

diff --git a/mod/menu/main.qc b/mod/menu/main.qc
deleted file mode 100644 (file)
index d84239c..0000000
--- a/mod/menu/main.qc
+++ /dev/null
@@ -1,9 +0,0 @@
-REGISTER_MUTATOR(mutator_mod, cvar("g_mod"));
-
-MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsString) {
-    ret_string = strcat(ret_string, ":mod");
-}
-
-MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsPrettyString) {
-    ret_string = strcat(ret_string, ", Mod");
-}

diff --git a/mod/menu/progs.inc b/mod/menu/progs.inc
deleted file mode 100644 (file)
index ae91a9e..0000000
--- a/mod/menu/progs.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#if BUILD_MOD
-#include "main.qc"
-#endif

diff --git a/mod/server/main.qc b/mod/server/main.qc
deleted file mode 100644 (file)
index d84239c..0000000
--- a/mod/server/main.qc
+++ /dev/null
@@ -1,9 +0,0 @@
-REGISTER_MUTATOR(mutator_mod, cvar("g_mod"));
-
-MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsString) {
-    ret_string = strcat(ret_string, ":mod");
-}
-
-MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsPrettyString) {
-    ret_string = strcat(ret_string, ", Mod");
-}

diff --git a/mod/server/progs.inc b/mod/server/progs.inc
deleted file mode 100644 (file)
index ae91a9e..0000000
--- a/mod/server/progs.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#if BUILD_MOD
-#include "main.qc"
-#endif

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 5066696022308653a84774cbd84fc16494ef3d71..02e52fe0d1858aed9dad4a12a695e4064944ba58 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -76,4 +76,4 @@ weapons/projectile.qc // TODO
 ../warpzonelib/common.qc
 ../warpzonelib/util_server.qc
 
-../../mod/client/progs.inc
+../mod/client/progs.inc

diff --git a/qcsrc/menu/progs.src b/qcsrc/menu/progs.src
index 92b10fa4cf374a8b5658b5aa51cc7cf38db073c9..158d4f51b3dad4178ac10b55215412985b3183a9 100644 (file)
--- a/qcsrc/menu/progs.src
+++ b/qcsrc/menu/progs.src
@@ -29,4 +29,4 @@ xonotic/util.qc
 ../common/weapons/all.qc
 
 
-../../mod/menu/progs.inc
+../mod/menu/progs.inc

diff --git a/qcsrc/mod/client/main.qc b/qcsrc/mod/client/main.qc
new file mode 100644 (file)
index 0000000..d84239c
--- /dev/null
+++ b/qcsrc/mod/client/main.qc
@@ -0,0 +1,9 @@
+REGISTER_MUTATOR(mutator_mod, cvar("g_mod"));
+
+MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsString) {
+    ret_string = strcat(ret_string, ":mod");
+}
+
+MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsPrettyString) {
+    ret_string = strcat(ret_string, ", Mod");
+}

diff --git a/qcsrc/mod/client/progs.inc b/qcsrc/mod/client/progs.inc
new file mode 100644 (file)
index 0000000..ae91a9e
--- /dev/null
+++ b/qcsrc/mod/client/progs.inc
@@ -0,0 +1,3 @@
+#if BUILD_MOD
+#include "main.qc"
+#endif

diff --git a/qcsrc/mod/menu/main.qc b/qcsrc/mod/menu/main.qc
new file mode 100644 (file)
index 0000000..d84239c
--- /dev/null
+++ b/qcsrc/mod/menu/main.qc
@@ -0,0 +1,9 @@
+REGISTER_MUTATOR(mutator_mod, cvar("g_mod"));
+
+MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsString) {
+    ret_string = strcat(ret_string, ":mod");
+}
+
+MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsPrettyString) {
+    ret_string = strcat(ret_string, ", Mod");
+}

diff --git a/qcsrc/mod/menu/progs.inc b/qcsrc/mod/menu/progs.inc
new file mode 100644 (file)
index 0000000..ae91a9e
--- /dev/null
+++ b/qcsrc/mod/menu/progs.inc
@@ -0,0 +1,3 @@
+#if BUILD_MOD
+#include "main.qc"
+#endif

diff --git a/qcsrc/mod/server/main.qc b/qcsrc/mod/server/main.qc
new file mode 100644 (file)
index 0000000..d84239c
--- /dev/null
+++ b/qcsrc/mod/server/main.qc
@@ -0,0 +1,9 @@
+REGISTER_MUTATOR(mutator_mod, cvar("g_mod"));
+
+MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsString) {
+    ret_string = strcat(ret_string, ":mod");
+}
+
+MUTATOR_HOOKFUNCTION(mutator_mod, BuildMutatorsPrettyString) {
+    ret_string = strcat(ret_string, ", Mod");
+}

diff --git a/qcsrc/mod/server/progs.inc b/qcsrc/mod/server/progs.inc
new file mode 100644 (file)
index 0000000..ae91a9e
--- /dev/null
+++ b/qcsrc/mod/server/progs.inc
@@ -0,0 +1,3 @@
+#if BUILD_MOD
+#include "main.qc"
+#endif

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 22afdf4115d0f2b980107de653309720e4a68da5..f9193cbd005a6f405260b189f613e699eca40c01 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -122,4 +122,4 @@ weapons/weaponsystem.qc
 ../warpzonelib/server.qc
 ../warpzonelib/util_server.qc
 
-../../mod/server/progs.inc
+../mod/server/progs.inc