From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 5 Sep 2015 01:12:20 +0000 (+1000)
Subject: Move mod directory below qcsrc
X-Git-Tag: xonotic-v0.8.2~1932
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e744d300162d41aec3e2a7f146012635e040b77a;p=xonotic%2Fxonotic-data.pk3dir.git

Move mod directory below qcsrc
---

diff --git a/mod/client/main.qc b/mod/client/main.qc
deleted file mode 100644
index d84239c0b..000000000
--- 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
index ae91a9e1c..000000000
--- 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
index d84239c0b..000000000
--- 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
index ae91a9e1c..000000000
--- 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
index d84239c0b..000000000
--- 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
index ae91a9e1c..000000000
--- 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 506669602..02e52fe0d 100644
--- 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 92b10fa4c..158d4f51b 100644
--- 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
index 000000000..d84239c0b
--- /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
index 000000000..ae91a9e1c
--- /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
index 000000000..d84239c0b
--- /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
index 000000000..ae91a9e1c
--- /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
index 000000000..d84239c0b
--- /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
index 000000000..ae91a9e1c
--- /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 22afdf411..f9193cbd0 100644
--- 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