X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcsqcmodellib%2Fcl_model.qc;h=7c723c44c2117995385e579e9bc47cb6bcbb53d4;hb=d0c9f09e15aac75e277d69de13bd23b719d3d52b;hp=3333096423ec0b04337349dd5985f1bdcd5d9fbf;hpb=b49873bcf5874782489e6fec264370078c7d6710;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/csqcmodellib/cl_model.qc b/qcsrc/csqcmodellib/cl_model.qc index 333309642..7c723c44c 100644 --- a/qcsrc/csqcmodellib/cl_model.qc +++ b/qcsrc/csqcmodellib/cl_model.qc @@ -203,7 +203,7 @@ void CSQCModel_Draw() void CSQCModel_Read(float isnew) { float sf; - sf = ReadShort(); + sf = ReadInt24_t(); // some nice flags for CSQCMODEL_IF and the hooks local noref float isplayer = (self.entnum >= 1 && self.entnum <= maxclients); @@ -237,9 +237,9 @@ void CSQCModel_Read(float isnew) if(sf & CSQCMODEL_PROPERTY_MODELINDEX) { - vector oldmins = self.mins, oldmaxs = self.maxs; + vector pmin = self.mins, pmax = self.maxs; setmodelindex(self, self.modelindex); // this retrieves the .model key and sets mins/maxs/absmin/absmax - setsize(self, oldmins, oldmaxs); + setsize(self, pmin, pmax); } if(sf & CSQCMODEL_PROPERTY_TELEPORTED) @@ -247,7 +247,7 @@ void CSQCModel_Read(float isnew) self.iflags |= IFLAG_TELEPORTED; self.csqcmodel_teleported = 1; } - + CSQCModel_InterpolateAnimation_Note(sf); InterpolateOrigin_Note(); CSQCPlayer_PostUpdate(); @@ -263,11 +263,7 @@ void CSQCModel_Read(float isnew) setorigin(self, self.origin); // set obvious render flags -#ifdef COMPAT_XON050_ENGINE - if(self.entnum == player_localentnum || self.entnum == spectatee_status) -#else if(self.entnum == player_localentnum) -#endif self.renderflags |= RF_EXTERNALMODEL; else self.renderflags &= ~RF_EXTERNALMODEL;