]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
don't get stuck on idle anim in midair
authorFruitieX <fruitiex@gmail.com>
Thu, 26 May 2011 01:02:54 +0000 (04:02 +0300)
committerFruitieX <fruitiex@gmail.com>
Thu, 26 May 2011 01:02:54 +0000 (04:02 +0300)
qcsrc/server/cl_player.qc

index 2f46fc1a24ed4ea74a2d221a5baf74032fa944f3..8819ba765bf31c1f0167a9508ea4b77de1cd206b 100644 (file)
@@ -262,7 +262,7 @@ void player_anim (void)
                        if (self.crouch)
                        {
                                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)
+                               if(!trace_startsolid && trace_fraction == 1 || self.animstate_startframe == 7) // don't get stuck on idle animation in midair
                                {
                                        setanim(self, self.anim_duckjump, FALSE, TRUE, self.restart_jump);
                                        self.restart_jump = FALSE;
@@ -271,7 +271,7 @@ void player_anim (void)
                        else
                        {
                                traceline(self.origin + '0 0 1' * PL_MIN_z, self.origin + '0 0 1' * (PL_MIN_z - autocvar_sv_player_jumpanim_minfall), TRUE, self);
-                               if(!trace_startsolid && trace_fraction == 1)
+                               if(!trace_startsolid && trace_fraction == 1 || self.animstate_startframe == 7) // don't get stuck on idle animation in midair
                                {
                                        setanim(self, self.anim_jump, FALSE, TRUE, self.restart_jump);
                                        self.restart_jump = FALSE;