]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
fix some cases when the crouch anim wouldn't be switched to
authorFruitieX <fruitiex@gmail.com>
Thu, 9 Jun 2011 12:31:21 +0000 (15:31 +0300)
committerFruitieX <fruitiex@gmail.com>
Thu, 9 Jun 2011 12:31:21 +0000 (15:31 +0300)
qcsrc/server/cl_player.qc

index c52a222ce9c7b296d95a6d7ac0213187ca3c1806..a9333a18875284f10f18725b0d8feb1c87b0f349 100644 (file)
@@ -266,7 +266,7 @@ void player_anim (void)
                                if (self.animstate_startframe != self.anim_duckjump_x) // don't perform another trace if already playing the crouch jump anim
                                {
                                        traceline(self.origin + '0 0 1' * PL_CROUCH_MIN_z, self.origin + '0 0 1' * (PL_CROUCH_MIN_z - autocvar_sv_player_jumpanim_minfall), TRUE, self);
-                                       if(!trace_startsolid && trace_fraction == 1 || self.animstate_startframe == self.anim_idle_x) // don't get stuck on idle animation in midair
+                                       if(!trace_startsolid && trace_fraction == 1 || !(self.animstate_startframe == self.anim_duckwalk_x || self.animstate_startframe == self.anim_duckidle_x)) // don't get stuck on non-crouch anims
                                        {
                                                setanim(self, self.anim_duckjump, FALSE, TRUE, self.restart_jump);
                                                self.restart_jump = FALSE;
@@ -323,6 +323,7 @@ void player_anim (void)
                }
                else
                        setanim(self, self.anim_idle, TRUE, FALSE, FALSE);
+               print(ftos(time), " ", ftos(self.animstate_startframe), "\n");
        }
 
        if (self.weaponentity)