Merge branch 'master' into TimePath/unified_weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / progs.inc

diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc
index 3d742a624588ce6de0fc83ae2fef10896ea172ea..39faa989edde675731ed543944ccf87794bd0113 100644 (file)
--- a/qcsrc/client/progs.inc
+++ b/qcsrc/client/progs.inc
@@ -56,11 +56,11 @@
 #include "../common/items/all.qc"
 #include "../common/monsters/all.qc"
 #include "../common/mutators/all.qc"
+#include "../common/turrets/all.qc"
 #include "../common/vehicles/all.qc"
 #include "../common/weapons/all.qc"
 
 #include "../common/turrets/cl_turrets.qc"
-#include "../common/turrets/all.qc"
 
 #include "../common/triggers/include.qc"
 
@@ -75,4 +75,6 @@
 #include "../warpzonelib/common.qc"
 #include "../warpzonelib/util_server.qc"
 
-#include "../mod/client/progs.inc"
+#if BUILD_MOD
+#include "../../mod/client/progs.inc"
+#endif