Merge remote-tracking branch 'origin/TimePath/experiments/csqc_prediction' into TimeP...

[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 2be2c728ba8c755d337e3ab2d4c40c32d6099b46..6d3542bd0028ad55f84a4c817e4c78b5f6bf1d16 100644 (file)
--- a/qcsrc/csqcmodellib/cl_model.qc
+++ b/qcsrc/csqcmodellib/cl_model.qc
@@ -19,9 +19,22 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-
-var float autocvar_cl_lerpanim_maxdelta_framegroups = 0.1;
-var float autocvar_cl_nolerp = 0;
+ #if defined(CSQC)
+        #include "../dpdefs/csprogsdefs.qh"
+        #include "../client/defs.qh"
+        #include "../common/util.qh"
+        #include "../common/animdecide.qh"
+        #include "interpolate.qh"
+        #include "../common/csqcmodel_settings.qh"
+        #include "common.qh"
+        #include "cl_model.qh"
+        #include "cl_player.qh"
+ #elif defined(MENUQC)
+ #elif defined(SVQC)
+ #endif
+
+float autocvar_cl_lerpanim_maxdelta_framegroups = 0.1;
+float autocvar_cl_nolerp = 0;
 
 .float csqcmodel_lerpfrac;
 .float csqcmodel_lerpfrac2;
@@ -94,9 +107,9 @@ void CSQCModel_InterpolateAnimation_1To2_Note(int sf, float set_times)
 void CSQCModel_InterpolateAnimation_Note(float sf)
 {
 #ifdef CSQCMODEL_HAVE_TWO_FRAMES
-       CSQCModel_InterpolateAnimation_2To4_Note(sf, TRUE);
+       CSQCModel_InterpolateAnimation_2To4_Note(sf, true);
 #else
-       CSQCModel_InterpolateAnimation_1To2_Note(sf, TRUE);
+       CSQCModel_InterpolateAnimation_1To2_Note(sf, true);
 #endif
 }
 
@@ -173,9 +186,9 @@ void CSQCModel_InterpolateAnimation_Do()
 void CSQCModel_Draw()
 {
        // some nice flags for CSQCMODEL_IF and the hooks
-       local noref bool isplayer = (self.entnum >= 1 && self.entnum <= maxclients);
-       local noref bool islocalplayer = (self.entnum == player_localnum + 1);
-       local noref bool isnolocalplayer = (isplayer && (self.entnum != player_localnum + 1));
+       bool isplayer = (self.entnum >= 1 && self.entnum <= maxclients);
+       noref bool islocalplayer = (self.entnum == player_localnum + 1);
+       noref bool isnolocalplayer = (isplayer && (self.entnum != player_localnum + 1));
 
        // we don't do this for the local player as that one is already handled
        // by CSQCPlayer_SetCamera()
@@ -200,14 +213,14 @@ void CSQCModel_Draw()
        self.csqcmodel_teleported = 0;
 }
 
-void CSQCModel_Read(float isnew)
+void CSQCModel_Read(bool isnew)
 {
        int sf = ReadInt24_t();
 
        // some nice flags for CSQCMODEL_IF and the hooks
-       local noref bool isplayer = (self.entnum >= 1 && self.entnum <= maxclients);
-       local noref bool islocalplayer = (self.entnum == player_localnum + 1);
-       local noref bool isnolocalplayer = (isplayer && (self.entnum != player_localnum + 1));
+       bool isplayer = (self.entnum >= 1 && self.entnum <= maxclients);
+       bool islocalplayer = (self.entnum == player_localnum + 1);
+       noref bool isnolocalplayer = (isplayer && (self.entnum != player_localnum + 1));
 
        self.classname = "csqcmodel";
        self.iflags |= IFLAG_ORIGIN; // interpolate origin too