Skip to content

Commit dba8200

Browse files
Fix playAnim (#781)
* playanim if it was good * dont mind me --------- Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
1 parent a296b33 commit dba8200

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

source/funkin/backend/FunkinSprite.hx

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
126126
// hate how it looks like but hey at least its optimized and fast - Nex
127127
if (!debugMode && isAnimFinished()) {
128128
var name = getAnimName() + '-loop';
129-
if (hasAnimation(name))
129+
if (hasAnim(name))
130130
playAnim(name, null, lastAnimContext);
131131
}
132132
}
@@ -307,7 +307,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
307307

308308
public function playAnim(AnimName:String, ?Force:Null<Bool>, Context:PlayAnimContext = NONE, Reversed:Bool = false, Frame:Int = 0):Void
309309
{
310-
if (AnimName == null)
310+
if (AnimName == null || (!hasAnim(AnimName) && !debugMode))
311311
return;
312312

313313
if (Force == null) {
@@ -318,16 +318,10 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
318318
if (animateAtlas != null)
319319
{
320320
@:privateAccess
321-
// if (!animateAtlas.anim.animsMap.exists(AnimName) && !animateAtlas.anim.symbolDictionary.exists(AnimName)) return;
322321
animateAtlas.anim.play(AnimName, Force, Reversed, Frame);
323322
atlasPlayingAnim = AnimName;
324323
}
325-
else
326-
{
327-
if (!animation.exists(AnimName) && !debugMode)
328-
return;
329-
animation.play(AnimName, Force, Reversed, Frame);
330-
}
324+
else animation.play(AnimName, Force, Reversed, Frame);
331325

332326
var daOffset = getAnimOffset(AnimName);
333327
frameOffset.set(daOffset.x, daOffset.y);
@@ -414,9 +408,9 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
414408
}
415409

416410
// Backwards compat (the names used to be all different and it sucked, please lets use the same format in the future) - Nex
417-
public inline function hasAnimation(AnimName:String) return hasAnim(AnimName);
418-
public inline function removeAnimation(name:String) return removeAnim(name);
419-
public inline function stopAnimation() return stopAnim();
411+
@:dox(hide) public inline function hasAnimation(AnimName:String) return hasAnim(AnimName);
412+
@:dox(hide) public inline function removeAnimation(name:String) return removeAnim(name);
413+
@:dox(hide) public inline function stopAnimation() return stopAnim();
420414
#end
421415

422416
// Getter / Setters

0 commit comments

Comments
 (0)