play the jump animation on jumppads no matter what, except over animation overrides

diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index b07f04d5723255580b7881977fd3ae4bd7e80dd3..9bea9197d9fca51a40714c454292246f0d0d9bc4 100644 (file)
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -193,15 +193,12 @@ void trigger_push_touch()
                        else
                                other.lastteleporttime = time;
 
-                       if (other.crouch)
+                       if (!other.animstate_override)
                        {
-                               setanim(other, other.anim_duckjump, FALSE, TRUE, other.restart_jump);
-                               other.restart_jump = FALSE;
-                       }
-                       else
-                       {
-                               setanim(other, other.anim_jump, FALSE, TRUE, other.restart_jump);
-                               other.restart_jump = FALSE;
+                               if (other.crouch)
+                                       setanim(other, other.anim_duckjump, TRUE, TRUE, TRUE);
+                               else
+                                       setanim(other, other.anim_jump, TRUE, TRUE, TRUE);
                        }
                }
                else