Skip to content

Commit b8060b8

Browse files
committed
ahoi
1 parent 627e321 commit b8060b8

File tree

3 files changed

+6
-20
lines changed

3 files changed

+6
-20
lines changed

assets

Submodule assets updated 89 files

source/funkin/graphics/FunkinSprite.hx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,9 @@ class FunkinSprite extends FlxAnimate
420420
}
421421

422422
/**
423-
* Gets the current animation ID.
423+
* Returns the name of the animation that is currently playing.
424+
* If no animation is playing (usually this means the sprite is BROKEN!),
425+
* returns an empty string to prevent NPEs.
424426
*/
425427
public function getCurrentAnimation():String
426428
{

source/funkin/play/notes/StrumlineNote.hx

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ class StrumlineNote extends FunkinSprite
4242
*/
4343
static final CONFIRM_HOLD_TIME:Float = 0.15;
4444

45+
static final DEFAULT_OFFSET:Int = 13;
46+
4547
/**
4648
* How long the hold note animation has been playing after a note is pressed.
4749
*/
@@ -183,24 +185,6 @@ class StrumlineNote extends FunkinSprite
183185

184186
private inline function gotCorrectConfirmHoldAnimation():Bool
185187
return animation?.getByName("confirm-hold")?.looped ?? false;
186-
187-
/**
188-
* Returns the name of the animation that is currently playing.
189-
* If no animation is playing (usually this means the sprite is BROKEN!),
190-
* returns an empty string to prevent NPEs.
191-
*/
192-
public function getCurrentAnimation():String
193-
{
194-
if (this.animation == null || this.animation.curAnim == null) return "";
195-
return this.animation.curAnim.name;
196-
}
197-
198-
public function isAnimationFinished():Bool
199-
{
200-
return this.animation?.finished ?? true;
201-
}
202-
203-
static final DEFAULT_OFFSET:Int = 13;
204188

205189
/**
206190
* Adjusts the position of the sprite's graphic relative to the hitbox.

0 commit comments

Comments
 (0)