diff --git a/gitVersion.json b/gitVersion.json index 41f533fc..96dd2c2e 100644 --- a/gitVersion.json +++ b/gitVersion.json @@ -1,4 +1,4 @@ { "version":"1.3.5", - "description":"V1.4 Release WIP" + "description":"V1.4.0b Release Soon" } \ No newline at end of file diff --git a/source/Paths.hx b/source/Paths.hx index ed6c4f4f..cd9a06d5 100644 --- a/source/Paths.hx +++ b/source/Paths.hx @@ -229,9 +229,14 @@ class Paths return getPreloadPath(file); } + static var currentLevel:String; + inline public static function getPreloadPath(file:String = '') { - return 'assets/$file'; + var path = 'assets/$file'; + if (currentLevel != null && Assets.exists('$currentLevel:$path')) + return '$currentLevel:$path'; + return path; } inline static public function txt(key:String, ?library:String) diff --git a/source/import.hx b/source/import.hx index c3c93799..0059a1d9 100644 --- a/source/import.hx +++ b/source/import.hx @@ -1,4 +1,5 @@ // This just contains global imports. +#if !macro // FLIXEL import flixel.tweens.FlxTween; import flixel.tweens.FlxEase; @@ -22,7 +23,7 @@ import meta.MusicBeatState; import meta.MusicBeatSubstate; import meta.state.PlayState; import meta.Controls; -#if !macro import Paths; #end +import Paths; #if MODS_ALLOWED import backend.Mods; #end @@ -41,4 +42,5 @@ import sys.FileSystem; import openfl.utils.Assets as OpenFlAssets; using StringTools; -using meta.CoolUtil; \ No newline at end of file +using meta.CoolUtil; +#end \ No newline at end of file diff --git a/source/meta/state/MainMenuState.hx b/source/meta/state/MainMenuState.hx index f7117385..ecaf8b51 100644 --- a/source/meta/state/MainMenuState.hx +++ b/source/meta/state/MainMenuState.hx @@ -63,7 +63,7 @@ class MainMenuState extends MusicBeatState { public static var nightly:String = #if nightly '-nightly' #else '' #end; - public static var joalor64EngineVersion:String = '1.4.0 (UNRELEASED)'; // Used for Discord RPC + public static var joalor64EngineVersion:String = '1.4.0b'; // Used for Discord RPC public static var psychEngineVersion:String = '0.6.3'; public static var psychGitBuild:String = 'eb79a80'; diff --git a/source/meta/state/TitleState.hx b/source/meta/state/TitleState.hx index a98381e5..9c95de20 100644 --- a/source/meta/state/TitleState.hx +++ b/source/meta/state/TitleState.hx @@ -232,7 +232,7 @@ class TitleState extends MusicBeatState titleText.updateHitbox(); add(titleText); - var versionShit:FlxText = new FlxText(12, FlxG.height - 24, 0, "Joalor64 Engine Rewritten v1.4.0 (PE 0.6.3)", 12); + var versionShit:FlxText = new FlxText(12, FlxG.height - 24, 0, "Joalor64 Engine Rewritten v1.4.0b (PE 0.6.3)", 12); #if debug versionShit.text += " DEBUG BUILD"; #elseif nightly versionShit.text += " NIGHTLY BUILD"; #end versionShit.scrollFactor.set(); versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);