AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1200 from Spel0/no-preload-crash-fix

Browse Source 
No characters preload crash fix
This commit is contained in:
Kade M 2021-07-06 22:10:25 -07:00 committed by GitHub
commit b5fab53ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/Paths.hx
View File

@ -131,7 +131,10 @@ class Paths
inline static public function getSparrowAtlas(key:String, ?library:String, ?isCharacter:Bool = false) inline static public function getSparrowAtlas(key:String, ?library:String, ?isCharacter:Bool = false)
{ {
if (isCharacter) if (isCharacter)
if (FlxG.save.data.cacheImages)
return FlxAtlasFrames.fromSparrow(imageCached(key), file('images/characters/$key.xml', library)); return FlxAtlasFrames.fromSparrow(imageCached(key), file('images/characters/$key.xml', library));
else
return FlxAtlasFrames.fromSparrow(image('characters/$key'), file('images/characters/$key.xml'));
return FlxAtlasFrames.fromSparrow(image(key, library), file('images/$key.xml', library)); return FlxAtlasFrames.fromSparrow(image(key, library), file('images/$key.xml', library));
} }
@ -145,7 +148,10 @@ class Paths
inline static public function getPackerAtlas(key:String, ?library:String, ?isCharacter:Bool = false) inline static public function getPackerAtlas(key:String, ?library:String, ?isCharacter:Bool = false)
{ {
if (isCharacter) if (isCharacter)
return FlxAtlasFrames.fromSpriteSheetPacker(imageCached(key), file('images/characters/$key.txt', library)); if (FlxG.save.data.cacheImages)
return FlxAtlasFrames.fromSpriteSheetPacker(imageCached(key), file('images/$key.txt', library));
else
return FlxAtlasFrames.fromSpriteSheetPacker(image('characters/$key'), file('images/characters/$key.txt'));
return FlxAtlasFrames.fromSpriteSheetPacker(image(key, library), file('images/$key.txt', library)); return FlxAtlasFrames.fromSpriteSheetPacker(image(key, library), file('images/$key.txt', library));
} }
} }