Weapons: assert weaponentity.state

[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 20020261c0c095b7c4df3bf9c5f4a511fe4958ad..f9f4083e3475786fc617e77e08941bef1bf5055d 100644 (file)
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -1,6 +1,7 @@
-#include "_all.qh"
 
+#include "g_subs.qh"
 #include "../common/triggers/subs.qh"
+#include "../common/triggers/triggers.qh"
 
 entityclass(BGMScript);
 class(BGMScript) .string bgmscript;
@@ -10,7 +11,7 @@ class(BGMScript) .float bgmscriptsustain;
 class(BGMScript) .float bgmscriptrelease;
 
 #include "../common/constants.qh"
-#include "../csqcmodellib/sv_model.qh"
+#include "../lib/csqcmodel/sv_model.qh"
 
 .float modelscale;
 
@@ -25,13 +26,13 @@ void g_model_setcolormaptoactivator (void)
        }
        else
                self.colormap = floor(random() * 256);
-       self.colormap |= 1024; // RENDER_COLORMAPPED
+       self.colormap |= BIT(10); // RENDER_COLORMAPPED
 }
 
 void g_clientmodel_setcolormaptoactivator (void)
 {SELFPARAM();
        g_model_setcolormaptoactivator();
-       self.SendFlags |= (8 | 1);
+       self.SendFlags |= (BIT(3) | BIT(0));
 }
 
 void g_clientmodel_use(void)