diff --git a/source/funkin/backend/utils/ShaderResizeFix.hx b/source/funkin/backend/utils/ShaderResizeFix.hx index 4bbc401e..ca470656 100644 --- a/source/funkin/backend/utils/ShaderResizeFix.hx +++ b/source/funkin/backend/utils/ShaderResizeFix.hx @@ -11,7 +11,7 @@ class ShaderResizeFix { public inline static function fixSpritesShadersSizes() { if (!doResizeFix) return; - + fixSpriteShaderSize(Main.instance); if (FlxG.game != null) fixSpriteShaderSize(FlxG.game); @@ -20,7 +20,7 @@ class ShaderResizeFix { @:privateAccess if (cam != null && (cam._filters != null || cam._filters != [])) fixSpriteShaderSize(cam.flashSprite); - } + } } public inline static function fixSpriteShaderSize(sprite:Sprite) // Shout out to Ne_Eo for bringing this to my attention diff --git a/source/funkin/editors/character/CharacterEditor.hx b/source/funkin/editors/character/CharacterEditor.hx index ed667c27..82098320 100644 --- a/source/funkin/editors/character/CharacterEditor.hx +++ b/source/funkin/editors/character/CharacterEditor.hx @@ -239,13 +239,13 @@ class CharacterEditor extends UIState { uiGroup.add(characterPropertiresWindow); characterAnimsWindow = new UIButtonList(777, 209, 473, 488, "Character Animations", FlxPoint.get(429, 32)); - characterAnimsWindow.addButton.callback = - function() CharacterEditor.instance.createAnimWithUI(); - for (i=>anim in character.getNameList()) + characterAnimsWindow.addButton.callback = function() CharacterEditor.instance.createAnimWithUI(); + var animOrder = character.getAnimOrder(); + for (i=>anim in animOrder) characterAnimsWindow.add(new CharacterAnimButtons(0,0, anim, character.getAnimOffset(anim))); uiGroup.add(characterAnimsWindow); - playAnimation(character.getNameList()[0]); + playAnimation(animOrder[0]); add(topMenuSpr); add(uiGroup); diff --git a/source/funkin/game/Character.hx b/source/funkin/game/Character.hx index 6ef436d6..04a64ff2 100644 --- a/source/funkin/game/Character.hx +++ b/source/funkin/game/Character.hx @@ -444,6 +444,12 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset public inline function getIcon() return (icon != null) ? icon : curCharacter; + public function getAnimOrder() { + return [for(a in xml.nodes.anim) if(a.has.name) a.att.name]; + } + + // Statics + public static function getIconFromCharName(?curCharacter:String) { if(curCharacter == null) return "face"; var icon = curCharacter;