Add a hack to fix players with MOVETYPE_FOLLOW

diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc
index 8a624aa2aa98d2c6dc1e966d9fc088dbaa1e07e7..5c2caa6a7f04c7d8c6a3a9b60040b95e035602ee 100644 (file)
--- a/qcsrc/common/animdecide.qc
+++ b/qcsrc/common/animdecide.qc
@@ -158,6 +158,8 @@ vector animdecide_getupperanim(entity e)
 vector animdecide_getloweranim(entity e)
 {
        // death etc.
+       if(e.anim_state & ANIMSTATE_FOLLOW)
+               return vec3(((e.anim_state & ANIMSTATE_DUCK) ? e.anim_duckidle_x : e.anim_idle_x), e.anim_time, ANIMPRIO_DEAD); // dead priority so it's above all
        if(e.anim_state & ANIMSTATE_FROZEN)
                return vec3(e.anim_idle.x, e.anim_time, ANIMPRIO_DEAD);
        if(e.anim_state & ANIMSTATE_DEAD1)

diff --git a/qcsrc/common/animdecide.qh b/qcsrc/common/animdecide.qh
index f1bdcb7e94838788655c19994311ddd033523041..d122b6a36288c9b2d43eb083e980881af537dcd1 100644 (file)
--- a/qcsrc/common/animdecide.qh
+++ b/qcsrc/common/animdecide.qh
@@ -66,6 +66,7 @@ const int ANIMSTATE_DEAD1 = 1; // base frames: die1
 const int ANIMSTATE_DEAD2 = 2; // base frames: die2
 const int ANIMSTATE_DUCK = 4; // turns walk into duckwalk, jump into duckjump, etc.
 const int ANIMSTATE_FROZEN = 8; // force idle
+const int ANIMSTATE_FOLLOW = 16; // also force idle
 
 // implicit anim states (inferred from velocity, etc.)
 const int ANIMIMPLICITSTATE_INAIR = 1;

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 9add7e8080891d20e7244279d3a66d95ae31bced..76253977c181d20cb6ebb34dfe0c5517300b815f 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -153,6 +153,8 @@ void player_anim (void)
        int animbits = deadbits;
        if(self.frozen)
                animbits |= ANIMSTATE_FROZEN;
+       if(self.movetype == MOVETYPE_FOLLOW)
+               animbits |= ANIMSTATE_FOLLOW;
        if(self.crouch)
                animbits |= ANIMSTATE_DUCK;
        animdecide_setstate(self, animbits, false);