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

Merge branch 'master' into no-preload-crash-fix

Browse Source
This commit is contained in:
Kade M
2021-07-06 22:10:21 -07:00
committed by GitHub
parent ed01550d4d d0d2adcbfe
commit 4a3983d20c
5 changed files with 287 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/Paths.hx
View File

@ -134,14 +134,13 @@ class Paths
if (FlxG.save.data.cacheImages)
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('characters/$key'), file('images/characters/$key.xml'));
return FlxAtlasFrames.fromSparrow(image(key, library), file('images/$key.xml', library));
}
inline static public function imageCached(key:String):FlxGraphic
{
var data = FlxGraphic.fromBitmapData(Caching.bitmapData.get(key));
var data = Caching.bitmapData.get(key);
trace('finding ${key} - ${data.bitmap}');
return data;
}
@ -152,7 +151,7 @@ class Paths
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('characters/$key'), file('images/characters/$key.txt'));
return FlxAtlasFrames.fromSpriteSheetPacker(image(key, library), file('images/$key.txt', library));
}
}