Fix compilation with gmqcc.

[xonotic/xonotic-data.pk3dir.git] / qcsrc / csqcmodellib / cl_model.qc

diff --git a/qcsrc/csqcmodellib/cl_model.qc b/qcsrc/csqcmodellib/cl_model.qc
index 85e2f15ee99ca82f51732b0ff8ca4faaaf09d61b..2c7bc2d925da89fc0c1d971ad86e2ca696cddb2c 100644 (file)
--- a/qcsrc/csqcmodellib/cl_model.qc
+++ b/qcsrc/csqcmodellib/cl_model.qc
@@ -182,7 +182,6 @@ void CSQCModel_Draw()
        if(!CSQCPlayer_IsLocalPlayer())
                InterpolateOrigin_Do();
 
-       // TODO csqcplayers: run prediction here too
        CSQCModel_InterpolateAnimation_Do();
 
        { CSQCMODEL_HOOK_PREDRAW }
@@ -193,7 +192,7 @@ void CSQCModel_Draw()
                root = root.tag_entity;
        if(self != root)
        {
-               self.renderflags &~= RF_EXTERNALMODEL | RF_VIEWMODEL;
+               self.renderflags &= ~(RF_EXTERNALMODEL | RF_VIEWMODEL);
                self.renderflags |= (root.renderflags & (RF_EXTERNALMODEL | RF_VIEWMODEL));
        }
 
@@ -212,6 +211,7 @@ void CSQCModel_Read(float isnew)
        local noref float isnolocalplayer = (isplayer && (self.entnum != player_localnum + 1));
 
        self.classname = "csqcmodel";
+       self.iflags |= IFLAG_ORIGIN; // interpolate origin too
        self.iflags |= IFLAG_ANGLES; // interpolate angles too
        self.iflags |= IFLAG_VELOCITY | IFLAG_AUTOVELOCITY; // let's calculate velocity automatically
 
@@ -267,7 +267,7 @@ void CSQCModel_Read(float isnew)
 #endif
                self.renderflags |= RF_EXTERNALMODEL;
        else
-               self.renderflags &~= RF_EXTERNALMODEL;
+               self.renderflags &= ~RF_EXTERNALMODEL;
 
        // draw it
        self.drawmask = MASK_NORMAL;