diff --git a/project.xml b/project.xml index 2116b613..29b3a899 100644 --- a/project.xml +++ b/project.xml @@ -154,7 +154,7 @@ - + diff --git a/source/funkin/backend/assets/ModsFolder.hx b/source/funkin/backend/assets/ModsFolder.hx index 68d2a12a..f69d9cc4 100644 --- a/source/funkin/backend/assets/ModsFolder.hx +++ b/source/funkin/backend/assets/ModsFolder.hx @@ -47,8 +47,9 @@ class ModsFolder { */ public static function init() { if(!getModsList().contains(Options.lastLoadedMod)) { + if(Options.lastLoadedMod != null) + Logs.warn("Mod \"" + Options.lastLoadedMod + "\" not found in mods list, switching to base game!"); Options.lastLoadedMod = null; - Logs.warn("Mod not found in mods list, switching to base game!"); } } diff --git a/source/funkin/backend/system/macros/BuildInfo.hx b/source/funkin/backend/system/macros/BuildInfo.hx index 5c2afe95..0d38bdae 100644 --- a/source/funkin/backend/system/macros/BuildInfo.hx +++ b/source/funkin/backend/system/macros/BuildInfo.hx @@ -6,7 +6,7 @@ using StringTools; class BuildInfo { public static function printBuildInfo() { if(haxe.macro.Context.defined("display")) return; - var haxeVersion = haxe.macro.Context.definedValue("haxe"); + var haxeVersion = haxe.macro.Context.definedValue("haxe").trim(); Sys.println('[ BUILD INFO ]'); Sys.println('Haxe Version: ${haxeVersion}'); try { @@ -20,7 +20,7 @@ class BuildInfo { var options = sys.io.File.getContent(exportPath); for(option in options.split("\n")) { if(option.startsWith("haxe=")) { - lastBuiltWith = option.substr(5); + lastBuiltWith = option.substr(5).trim(); break; } }