Merge branch 'master' into terencehill/hud_fixes

[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 eecb046b63f9974ae3c6ec7177835fc2981a1848..46ebe5ed89476348bc9411ba75c207153389d2b0 100644 (file)
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -15,7 +15,7 @@ class(BGMScript) .float bgmscriptrelease;
 
 .float modelscale;
 
-void g_model_setcolormaptoactivator (void)
+void g_model_setcolormaptoactivator ()
 {SELFPARAM();
        if(teamplay)
        {
@@ -29,13 +29,13 @@ void g_model_setcolormaptoactivator (void)
        self.colormap |= BIT(10); // RENDER_COLORMAPPED
 }
 
-void g_clientmodel_setcolormaptoactivator (void)
+void g_clientmodel_setcolormaptoactivator ()
 {SELFPARAM();
        g_model_setcolormaptoactivator();
        self.SendFlags |= (BIT(3) | BIT(0));
 }
 
-void g_clientmodel_use(void)
+void g_clientmodel_use()
 {SELFPARAM();
        if (self.antiwall_flag == 1)
        {
@@ -90,7 +90,7 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
        if(self.lodmodelindex1)
                sf |= 0x80;
 
-       WriteByte(MSG_ENTITY, ENT_CLIENT_WALL);
+       WriteHeader(MSG_ENTITY, ENT_CLIENT_WALL);
        WriteByte(MSG_ENTITY, sf);
 
        if(sf & BIT(0))