X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_jumppads.qc;h=5a5042b3d48a63dc1a273feff50b33e767a7de8f;hb=db5c4d5b616a207cc01a6c0a81c574a572ce0426;hp=8d21766a950712365daa0a315ecdce6566da91b9;hpb=d5c0efcb78a5ed485ccfc0da2f11274965973101;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc index 8d21766a9..5a5042b3d 100644 --- a/qcsrc/server/t_jumppads.qc +++ b/qcsrc/server/t_jumppads.qc @@ -200,14 +200,8 @@ void trigger_push_touch() else other.lastteleporttime = time; - if (!other.animstate_override) if (other.deadflag == DEAD_NO) - { - if (other.crouch) - setanim(other, other.anim_duckjump, FALSE, TRUE, TRUE); - else - setanim(other, other.anim_jump, FALSE, TRUE, TRUE); - } + animdecide_setaction(other, ANIMACTION_JUMP, TRUE); } else other.jumppadcount = TRUE;