From 32b21e21b275a1626e8ade58a8a2ef462045660a Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Tue, 26 Mar 2024 01:12:22 -0400 Subject: [PATCH 1/3] Update assets submodule --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 526743915..201e342c7 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 52674391511577300cdb8c08df293ea72099aa82 +Subproject commit 201e342c7f879b829446f6caf4e4052bd5852cfb From 8943cd117e6a95e26f01d962966e44ed03c40539 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Tue, 26 Mar 2024 01:12:46 -0400 Subject: [PATCH 2/3] Make the error message a bit better if an Animate atlas fails to parse. --- .../funkin/play/character/AnimateAtlasCharacter.hx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/source/funkin/play/character/AnimateAtlasCharacter.hx b/source/funkin/play/character/AnimateAtlasCharacter.hx index 9e7aa98bf..f1dadf3e2 100644 --- a/source/funkin/play/character/AnimateAtlasCharacter.hx +++ b/source/funkin/play/character/AnimateAtlasCharacter.hx @@ -76,10 +76,17 @@ class AnimateAtlasCharacter extends BaseCharacter { trace('Creating Animate Atlas character: ' + this.characterId); - var atlasSprite:FlxAtlasSprite = loadAtlasSprite(); - setSprite(atlasSprite); + try + { + var atlasSprite:FlxAtlasSprite = loadAtlasSprite(); + setSprite(atlasSprite); - loadAnimations(); + loadAnimations(); + } + catch (e) + { + throw "Exception thrown while building FlxAtlasSprite: " + e; + } super.onCreate(event); } From 6d4c2e804fb5e10c8ed93e982207fc61a0534d22 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 26 Mar 2024 01:30:48 -0400 Subject: [PATCH 3/3] assets submod --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 201e342c7..5f1726f1b 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 201e342c7f879b829446f6caf4e4052bd5852cfb +Subproject commit 5f1726f1b0c11fc747b7473708cf4e5f28be05f1