diff --git a/source/funkin/backend/system/Flags.hx b/source/funkin/backend/system/Flags.hx index bdc0ebb2..4d570854 100644 --- a/source/funkin/backend/system/Flags.hx +++ b/source/funkin/backend/system/Flags.hx @@ -36,7 +36,11 @@ class Flags { public static var MOD_DISCORD_LOGO_TEXT:String = ""; public static var MOD_REDIRECT_STATES:Map = []; + // -- Codename's Default Flags -- + @:lazy public static var SAVE_PATH:String = haxe.macro.Compiler.getDefine("SAVE_PATH"); + @:lazy public static var SAVE_NAME:String = haxe.macro.Compiler.getDefine("SAVE_NAME"); + public static var CURRENT_API_VERSION:Int = 1; public static var COMMIT_NUMBER:Int = GitCommitMacro.commitNumber; public static var COMMIT_HASH:String = GitCommitMacro.commitHash; diff --git a/source/funkin/backend/system/Main.hx b/source/funkin/backend/system/Main.hx index d2d3a1bf..00758ed9 100644 --- a/source/funkin/backend/system/Main.hx +++ b/source/funkin/backend/system/Main.hx @@ -155,7 +155,6 @@ class Main extends Sprite Assets.registerLibrary('default', lib); funkin.options.PlayerSettings.init(); - funkin.savedata.FunkinSave.init(); Options.load(); FlxG.fixedTimestep = false; diff --git a/source/funkin/backend/system/MainState.hx b/source/funkin/backend/system/MainState.hx index 1788db20..432e454a 100644 --- a/source/funkin/backend/system/MainState.hx +++ b/source/funkin/backend/system/MainState.hx @@ -108,6 +108,7 @@ class MainState extends FlxState { TranslationUtil.setLanguage(Flags.DISABLE_LANGUAGES ? Flags.DEFAULT_LANGUAGE : null); ModsFolder.onModSwitch.dispatch(ModsFolder.currentModFolder); // Loads global.hx MusicBeatTransition.script = Flags.DEFAULT_TRANSITION_SCRIPT; + funkin.savedata.FunkinSave.init(); WindowUtils.resetTitle(); Main.refreshAssets(); DiscordUtil.init(); diff --git a/source/funkin/savedata/FunkinSave.hx b/source/funkin/savedata/FunkinSave.hx index 93a8cfea..5e5ed2eb 100644 --- a/source/funkin/savedata/FunkinSave.hx +++ b/source/funkin/savedata/FunkinSave.hx @@ -24,7 +24,7 @@ class FunkinSave { public static var save:FlxSave; public static function init() { - var path = haxe.macro.Compiler.getDefine("SAVE_PATH"), name = haxe.macro.Compiler.getDefine("SAVE_NAME"); + var path = Flags.SAVE_PATH, name = Flags.SAVE_NAME; if (path == null) path = 'CodenameEngine'; if (name == null) name = 'save-default';