Merge branch 'master' into Mario/qc_physics_prehax

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_models.qc

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index 1a9be7ff257c938fc2eb04f0212efd423b945f6c..62b2cfb51dd5d3a5c9a52a38b78d9654c0e97e58 100644 (file)
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -1,7 +1,8 @@
 #include "_all.qh"
 
-#include "g_subs.qh"
-#include "g_triggers.qh"
+#include "../common/triggers/subs.qh"
+
+#include "../client/bgmscript.qh"
 
 #include "../common/constants.qh"
 #include "../csqcmodellib/sv_model.qh"
@@ -25,7 +26,7 @@ void g_model_setcolormaptoactivator (void)
 void g_clientmodel_setcolormaptoactivator (void)
 {
        g_model_setcolormaptoactivator();
-       self.SendFlags |= 9;
+       self.SendFlags |= (8 | 1);
 }
 
 void g_clientmodel_use(void)