Merge branch 'master' into TimePath/effectinfo

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

diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc
index b985e36f6763e2561d1c7398af44c0dae43d4a28..3d742a624588ce6de0fc83ae2fef10896ea172ea 100644 (file)
--- a/qcsrc/client/progs.inc
+++ b/qcsrc/client/progs.inc
@@ -38,6 +38,7 @@
 #include "../common/animdecide.qc"
 #include "../common/buffs.qc"
 #include "../common/effects/effects.qc"
+#include "../common/effects/effectinfo.qc"
 #include "../common/mapinfo.qc"
 #include "../common/movetypes/include.qc"
 #include "../common/nades.qc"
@@ -59,7 +60,7 @@
 #include "../common/weapons/all.qc"
 
 #include "../common/turrets/cl_turrets.qc"
-#include "../common/turrets/turrets.qc"
+#include "../common/turrets/all.qc"
 
 #include "../common/triggers/include.qc"