Merge branch 'master' into TimePath/global_self

[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 78150ddd50964cf14e3a74ff74cdc676b81d034e..ab93b0172370f1998d6fde329b8a5b65fad7ea43 100644 (file)
--- a/qcsrc/csqcmodellib/cl_model.qc
+++ b/qcsrc/csqcmodellib/cl_model.qc
@@ -19,6 +19,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+ #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;
@@ -29,7 +42,7 @@ float autocvar_cl_nolerp = 0;
 .float csqcmodel_lerpfrac2time;
 
 void CSQCModel_InterpolateAnimation_2To4_PreNote(int sf)
-{
+{SELFPARAM();
        if(sf & CSQCMODEL_PROPERTY_FRAME)
        {
                self.frame3 = self.frame;
@@ -48,14 +61,14 @@ void CSQCModel_InterpolateAnimation_2To4_PreNote(int sf)
        }
 }
 void CSQCModel_InterpolateAnimation_1To2_PreNote(int sf)
-{
+{SELFPARAM();
        if(sf & CSQCMODEL_PROPERTY_FRAME)
        {
                self.frame2 = self.frame;
                self.frame2time = self.frame1time;
        }
 }
-void CSQCModel_InterpolateAnimation_PreNote(float sf)
+void CSQCModel_InterpolateAnimation_PreNote(int sf)
 {
 #ifdef CSQCMODEL_HAVE_TWO_FRAMES
        CSQCModel_InterpolateAnimation_2To4_PreNote(sf);
@@ -65,7 +78,7 @@ void CSQCModel_InterpolateAnimation_PreNote(float sf)
 }
 
 void CSQCModel_InterpolateAnimation_2To4_Note(int sf, float set_times)
-{
+{SELFPARAM();
        if(sf & CSQCMODEL_PROPERTY_FRAME)
        {
                if(set_times)
@@ -84,14 +97,14 @@ void CSQCModel_InterpolateAnimation_2To4_Note(int sf, float set_times)
        }
 }
 void CSQCModel_InterpolateAnimation_1To2_Note(int sf, float set_times)
-{
+{SELFPARAM();
        if(sf & CSQCMODEL_PROPERTY_FRAME)
        {
                if(set_times)
                        self.frame1time = time;
        }
 }
-void CSQCModel_InterpolateAnimation_Note(float sf)
+void CSQCModel_InterpolateAnimation_Note(int sf)
 {
 #ifdef CSQCMODEL_HAVE_TWO_FRAMES
        CSQCModel_InterpolateAnimation_2To4_Note(sf, true);
@@ -101,7 +114,7 @@ void CSQCModel_InterpolateAnimation_Note(float sf)
 }
 
 void CSQCModel_InterpolateAnimation_2To4_Do()
-{
+{SELFPARAM();
        if(autocvar_cl_nolerp || (autocvar_cl_lerpanim_maxdelta_framegroups == 0))
        {
                self.lerpfrac = self.csqcmodel_lerpfrac;
@@ -148,7 +161,7 @@ void CSQCModel_InterpolateAnimation_2To4_Do()
        }
 }
 void CSQCModel_InterpolateAnimation_1To2_Do()
-{
+{SELFPARAM();
        if(autocvar_cl_nolerp || (autocvar_cl_lerpanim_maxdelta_framegroups == 0))
        {
                self.lerpfrac = 0;
@@ -171,7 +184,7 @@ void CSQCModel_InterpolateAnimation_Do()
 }
 
 void CSQCModel_Draw()
-{
+{SELFPARAM();
        // some nice flags for CSQCMODEL_IF and the hooks
        bool isplayer = (self.entnum >= 1 && self.entnum <= maxclients);
        noref bool islocalplayer = (self.entnum == player_localnum + 1);
@@ -200,8 +213,8 @@ void CSQCModel_Draw()
        self.csqcmodel_teleported = 0;
 }
 
-void CSQCModel_Read(float isnew)
-{
+void CSQCModel_Read(bool isnew)
+{SELFPARAM();
        int sf = ReadInt24_t();
 
        // some nice flags for CSQCMODEL_IF and the hooks