Merge branch 'master' into TimePath/debug_draw

[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 8bc5387367542162947a07b205be9b51b3db38a9..eecb046b63f9974ae3c6ec7177835fc2981a1848 100644 (file)
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -26,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)
@@ -93,20 +93,20 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
        WriteByte(MSG_ENTITY, ENT_CLIENT_WALL);
        WriteByte(MSG_ENTITY, sf);
 
-       if(sf & 1)
+       if(sf & BIT(0))
        {
                if(sf & 0x40)
                        WriteShort(MSG_ENTITY, self.colormap);
        }
 
-       if(sf & 2)
+       if(sf & BIT(1))
        {
                WriteCoord(MSG_ENTITY, self.origin.x);
                WriteCoord(MSG_ENTITY, self.origin.y);
                WriteCoord(MSG_ENTITY, self.origin.z);
        }
 
-       if(sf & 4)
+       if(sf & BIT(2))
        {
                if(sf & 0x10)
                {
@@ -116,7 +116,7 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
                }
        }
 
-       if(sf & 8)
+       if(sf & BIT(3))
        {
                if(sf & 0x80)
                {