X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_models.qc;h=baca561786a00bcf9da35e7883100fd622242951;hb=d271f27a5ac351a3a7b39636932f6d661492be1d;hp=eecb046b63f9974ae3c6ec7177835fc2981a1848;hpb=cd141fba8a7c59fef4b0e98eee651943b18cd99d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc index eecb046b6..baca56178 100644 --- a/qcsrc/server/g_models.qc +++ b/qcsrc/server/g_models.qc @@ -1,3 +1,4 @@ +#include "g_models.qh" #include "g_subs.qh" #include "../common/triggers/subs.qh" @@ -15,7 +16,7 @@ class(BGMScript) .float bgmscriptrelease; .float modelscale; -void g_model_setcolormaptoactivator (void) +void g_model_setcolormaptoactivator () {SELFPARAM(); if(teamplay) { @@ -29,13 +30,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) { @@ -50,8 +51,8 @@ void g_clientmodel_use(void) g_clientmodel_setcolormaptoactivator(); } -void g_model_dropbyspawnflags() -{SELFPARAM(); +void g_model_dropbyspawnflags(entity this) +{ if((self.spawnflags & 3) == 1) // ALIGN_ORIGIN { traceline(self.origin, self.origin - '0 0 4096', MOVE_NOMONSTERS, self); @@ -69,11 +70,11 @@ void g_model_dropbyspawnflags() } } -void g_clientmodel_dropbyspawnflags() -{SELFPARAM(); +void g_clientmodel_dropbyspawnflags(entity this) +{ vector o0; o0 = self.origin; - g_model_dropbyspawnflags(); + g_model_dropbyspawnflags(self); if(self.origin != o0) self.SendFlags |= 2; } @@ -90,7 +91,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))