Merge branch 'Mario/qc_updates' into TimePath/csqc_prediction

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

diff --git a/qcsrc/csqcmodellib/sv_model.qc b/qcsrc/csqcmodellib/sv_model.qc
index e0098b4876ea202ec2fdb12f50f9b0977084b50c..425c985ad6926cb6a060f30e924ec33964e79ddf 100644 (file)
--- a/qcsrc/csqcmodellib/sv_model.qc
+++ b/qcsrc/csqcmodellib/sv_model.qc
@@ -20,9 +20,23 @@
  * IN THE SOFTWARE.
  */
 
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qh"
+       #include "../dpdefs/dpextensions.qh"
+       #include "../common/constants.qh"
+       #include "../common/util.qh"
+       #include "../common/animdecide.qh"
+       #include "../server/constants.qh"
+       #include "../server/defs.qh"
+       #include "common.qh"
+       #include "sv_model.qh"
+#endif
+
 // generic CSQC model code
 
-float CSQCModel_Send(entity to, float sf)
+float CSQCModel_Send(entity to, int sf)
 {
        // some nice flags for CSQCMODEL_IF
        float isplayer = (IS_CLIENT(self));
@@ -34,7 +48,7 @@ float CSQCModel_Send(entity to, float sf)
        unused_float = isnolocalplayer;
 
        WriteByte(MSG_ENTITY, ENT_CLIENT_MODEL);
-       WriteShort(MSG_ENTITY, sf);
+       WriteInt24_t(MSG_ENTITY, sf);
 
 #define CSQCMODEL_IF(cond) if(cond) {
 #define CSQCMODEL_ENDIF }
@@ -50,7 +64,7 @@ float CSQCModel_Send(entity to, float sf)
 #undef CSQCMODEL_ENDIF
 #undef CSQCMODEL_IF
 
-       return TRUE;
+       return true;
 }
 
 #ifdef CSQCPLAYER_FORCE_UPDATES