Fix order when loading characters
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -239,13 +239,13 @@ class CharacterEditor extends UIState {
|
||||
uiGroup.add(characterPropertiresWindow);
|
||||
|
||||
characterAnimsWindow = new UIButtonList<CharacterAnimButtons>(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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user