diff --git a/assets/preload/images/money.json b/assets/preload/images/money.json index bd929d892..25bec979c 100644 --- a/assets/preload/images/money.json +++ b/assets/preload/images/money.json @@ -1,4 +1,4 @@ -{"ATLAS": {"SPRITES":[ +{"ATLAS": {"SPRITES":[ {"SPRITE" : {"name": "0000","x":1150,"y":0,"w":387,"h":220,"rotated": false}}, {"SPRITE" : {"name": "0001","x":399,"y":594,"w":194,"h":122,"rotated": false}}, {"SPRITE" : {"name": "0002","x":982,"y":700,"w":88,"h":148,"rotated": false}}, diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index bdcbd277c..96e67351a 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -24,7 +24,7 @@ import ui.Prompt; using StringTools; -#if desktop +#if discord_rpc import Discord.DiscordClient; #end #if newgrounds diff --git a/source/ui/ModMenu.hx b/source/ui/ModMenu.hx index 7fed9b4bb..7ee0e55a1 100644 --- a/source/ui/ModMenu.hx +++ b/source/ui/ModMenu.hx @@ -83,6 +83,7 @@ class ModMenu extends ui.OptionsState.Page organizeByY(); } + inline static var MOD_PATH = "./mods"; private function refreshModList():Void { while (grpMods.members.length > 0) @@ -93,16 +94,23 @@ class ModMenu extends ui.OptionsState.Page #if desktop var modList = []; modFolders = []; - - for (file in FileSystem.readDirectory('./mods')) + + trace("mods path:" + FileSystem.absolutePath(MOD_PATH)); + if (!FileSystem.exists(MOD_PATH)) { - if (FileSystem.isDirectory('./mods/' + file)) + FlxG.log.warn("missing mods folder, expected: " + FileSystem.absolutePath(MOD_PATH)); + return; + } + + for (file in FileSystem.readDirectory(MOD_PATH)) + { + if (FileSystem.isDirectory(MOD_PATH + file)) modFolders.push(file); } enabledMods = []; - modList = Polymod.scan('./mods'); + modList = Polymod.scan(MOD_PATH); trace(modList);