Merge remote-tracking branch 'origin/divVerent/csad' into divVerent/csad

Conflicts:
	qcsrc/client/csqcmodel_hooks.qc

diff --cc qcsrc/client/csqcmodel_hooks.qc
index bbe5618d9ba35ef332e017bd0aa1fc49958a0202,e181a29fd9a2330682cec8cddbbea8ad74d524a1..7a642e3bde8f3064b36cb3bb5a574187a2a40fd5
--- 1/qcsrc/client/csqcmodel_hooks.qc
--- 2/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@@ -588,8 -588,8 +588,8 @@@ void CSQCModel_Hook_PreDraw(float ispla
                else
                {
                        // we know that frame3 and frame4 fields, used by InterpolateAnimation, are left alone - but that is all we know!
 -                      float doblend = FALSE;
 +                      float doblend = autocvar__animblend;
-                       float flg = 0;
+                       float onground = 0;
                        if(self == csqcplayer)
                        {
                                if(self.pmove_flags & PMF_ONGROUND)
@@@ -604,11 -604,11 +604,12 @@@
                        {
                                traceline(self.origin + '0 0 1' * self.maxs_z, self.origin + '0 0 1' * (self.mins_z - 4), MOVE_NOMONSTERS, self);
                                if(trace_startsolid || trace_fraction < 1)
-                                       flg |= FL_ONGROUND;
+                                       onground = 1;
                        }
                        animdecide_init(self); // FIXME only do this on model change
-                       animdecide_setframes(self, flg, doblend, anim_frame, anim_frame1time, anim_frame2, anim_frame2time);
+                       animdecide_setimplicitstate(self, onground);
+                       animdecide_setframes(self, doblend, anim_frame, anim_frame1time, anim_frame2, anim_frame2time);
 +                      print(sprintf("frames: %d %d\n", self.anim_frame, self.anim_frame2));
                        float sf = 0;
                        if(self.anim_saveframe != self.anim_frame || self.anim_saveframe1time != self.anim_frame1time)
                                sf |= CSQCMODEL_PROPERTY_FRAME;

diff --cc qcsrc/server/cl_player.qc
Simple merge