csqcmodels: support effects properly

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

diff --git a/qcsrc/csqcmodel/cl_model.qc b/qcsrc/csqcmodel/cl_model.qc
index c6d2923d4514c9cc8da2ad41caaf91ae57e326f7..03226613b6afcf7641b99fe55dddd539cb6907c6 100644 (file)
--- a/qcsrc/csqcmodel/cl_model.qc
+++ b/qcsrc/csqcmodel/cl_model.qc
@@ -27,7 +27,6 @@ var float autocvar_cl_nolerp = 0;
 .float csqcmodel_lerpfrac2;
 .float csqcmodel_lerpfractime;
 .float csqcmodel_lerpfrac2time;
-.float csqcmodel_teleported;
 
 void CSQCModel_InterpolateAnimation_PreNote(float sf)
 {
@@ -166,6 +165,9 @@ void CSQCModel_Draw()
                self.renderflags &~= RF_EXTERNALMODEL | RF_VIEWMODEL;
                self.renderflags |= (root.renderflags & (RF_EXTERNALMODEL | RF_VIEWMODEL));
        }
+
+       // we're drawn, now teleporting is over
+       self.csqcmodel_teleported = 0;
 }
 
 void CSQCModel_Read()
@@ -237,3 +239,8 @@ void CSQCModel_Read()
        self.drawmask = MASK_NORMAL;
        self.predraw = CSQCModel_Draw;
 }
+
+entity CSQCModel_server2csqc(float pl)
+{
+       return findfloat(world, entnum, pl); // FIXME optimize this using an array
+}