marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the clonk sometimes stuck in infinite jump animation when actually scaling with one vertex.

qteditor
Clonkonaut 2016-06-18 19:47:39 +02:00
parent 5d2ae6a251
commit 3637e1f072
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
planet/Objects.ocd/Clonk.ocd/Animations.ocd/Script.c
View File

@ -770,6 +770,8 @@ func FxFallEffect(string new_name, object target)
func FxFallTimer(object target, effect, int timer)
{
if(GetAction() != "Jump")
return -1;
//falling off ledges without jumping results in fall animation
if(timer == 2 && GetYDir() > 1)
{
@ -785,8 +787,6 @@ func FxFallTimer(object target, effect, int timer)
PlayAnimation("FallLong", CLONK_ANIM_SLOT_Movement, Anim_Linear(0, 0, GetAnimationLength("FallLong"), 8*3, ANIM_Hold), Anim_Linear(0, 0, 1000, 5, ANIM_Remove));
return -1;
}
if(GetAction() != "Jump")
return -1;
}
/*--