diff --git a/buildnumber.txt b/buildnumber.txt index 6f6edaee..f699c943 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1307 \ No newline at end of file +1309 \ No newline at end of file diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx index 1000627d..0b5aab40 100644 --- a/source/funkin/game/Character.hx +++ b/source/funkin/game/Character.hx @@ -124,7 +124,7 @@ class Character extends FlxSprite implements IBeatReceiver implements IOffsetCom if (xml.has.antialiasing) antialiasing = (xml.att.antialiasing == "true"); if (xml.has.sprite) sprite = xml.att.sprite; - frames = CoolUtil.loadFrames(Paths.image('characters/$sprite', null, true)); + frames = Paths.getFrames('characters/$sprite', null); for(anim in xml.nodes.anim) { XMLUtil.addXMLAnimation(this, anim); } diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 7cccaf90..c9463f18 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1087,6 +1087,7 @@ class PlayState extends MusicBeatState // notes.add(unspawnNotes.shift()); + if (generatedMusic) { notes.forEachAlive(function(daNote:Note) @@ -1137,7 +1138,7 @@ class PlayState extends MusicBeatState }); } - + if (!inCutscene) keyShit(); diff --git a/source/funkin/system/Paths.hx b/source/funkin/system/Paths.hx index 9da1e09f..d2057117 100644 --- a/source/funkin/system/Paths.hx +++ b/source/funkin/system/Paths.hx @@ -168,6 +168,10 @@ class Paths { return FlxAtlasFrames.fromSparrow(image(key, library), file('images/$key.xml', library)); } + + inline static public function getFrames(key:String, ?library:String) { + return CoolUtil.loadFrames(Paths.image(key, library, true)); + } inline static public function getSparrowAtlasAlt(key:String) { return FlxAtlasFrames.fromSparrow('$key.png', '$key.xml');