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

Merge branch 'master' of https://github.com/KadeDev/Kade-Engine

Browse Source
This commit is contained in:
Kade M 2021-07-07 15:59:40 -07:00
commit 353a9c37e1
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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)
return FlxAtlasFrames.fromSparrow(imageCached(key), file('images/characters/$key.xml', library)); 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(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));
} }
} }

2
source/PlayState.hx
View File

@ -2776,7 +2776,7 @@ class PlayState extends MusicBeatState
else else
{ {
FlxG.sound.playMusic(Paths.music('freakyMenu')); FlxG.sound.playMusic(Paths.music('freakyMenu'));
FlxG.switchState(new MainMenuState()); FlxG.switchState(new StoryMenuState());
} }
#if windows #if windows