From e03cd7d1c36aa0ff1702d1b2a0ca9eed1017b170 Mon Sep 17 00:00:00 2001 From: AirDog46 Date: Wed, 23 Apr 2025 23:38:47 +0300 Subject: [PATCH] Fix typo, fix main menu not loading after title screen, remove one more useless file and fix probably intentional typo --- Project.xml | 4 +--- docs/building.md | 14 +++++++------- source/APIStuff.hx | 7 ------- source/Paths.hx | 6 +++--- source/TitleState.hx | 7 ++++++- 5 files changed, 17 insertions(+), 21 deletions(-) delete mode 100644 source/APIStuff.hx diff --git a/Project.xml b/Project.xml index 3504b38..8998948 100644 --- a/Project.xml +++ b/Project.xml @@ -16,7 +16,7 @@ - +* @@ -166,8 +166,6 @@ - - diff --git a/docs/building.md b/docs/building.md index 806c8f3..479b831 100644 --- a/docs/building.md +++ b/docs/building.md @@ -14,19 +14,19 @@ - Linux: install the `git` package: `sudo apt install git` (ubuntu), `sudo pacman -S git` (arch), etc... (you probably already have it) 4. Install and set up the necessary libraries: - `haxelib install lime 7.9.0` - - `haxelib install openfl` - - `haxelib install flixel` + - `haxelib install openfl 9.1.0` + - `haxelib install flixel 4.11.0` - `haxelib run lime setup` - `haxelib run lime setup flixel` - `haxelib install flixel-tools` - `haxelib run flixel-tools setup` - - `haxelib install flixel-addons` - - `haxelib install flixel-ui` - - `haxelib install hscript` - - `haxelib install newgrounds` + - `haxelib install flixel-addons 2.11.0` + - `haxelib install flixel-ui 2.4.0` + - `haxelib install hscript 2.3.0` + - `haxelib install newgrounds 1.1.5` - `haxelib git linc_luajit https://github.com/AndreiRudenko/linc_luajit.git` - `haxelib git faxe https://github.com/uhrobots/faxe` - - `haxelib git polymod https://github.com/larsiusprime/polymod.git` + - `haxelib install polymod 1.3.0` - `haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc` - `haxelib install actuate` - `haxelib git extension-webm https://github.com/KadeDev/extension-webm` diff --git a/source/APIStuff.hx b/source/APIStuff.hx deleted file mode 100644 index f05fa06..0000000 --- a/source/APIStuff.hx +++ /dev/null @@ -1,7 +0,0 @@ -package; - -class APIStuff -{ - public static var API:String = ""; - public static var EncKey:String = ""; -} diff --git a/source/Paths.hx b/source/Paths.hx index 8f3faa0..43d8a78 100644 --- a/source/Paths.hx +++ b/source/Paths.hx @@ -128,12 +128,12 @@ class Paths inline static public function getSparrowAtlas(key:String, ?library:String, ?isCharacter:Bool = false) { - var usecahce = FlxG.save.data.cacheImages; + var useCache = FlxG.save.data.cacheImages; #if !cpp - usecahce = false; + useCache = false; #end if (isCharacter) - if (usecahce) + if (useCache) #if cpp return FlxAtlasFrames.fromSparrow(imageCached(key), file('images/characters/$key.xml', library)); #else diff --git a/source/TitleState.hx b/source/TitleState.hx index 6a24c06..0beaf42 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -54,7 +54,7 @@ class TitleState extends MusicBeatState override public function create():Void { #if polymod - polymod.Polymod.init({modRoot: "mods", dirs: ['introMod']}); + //polymod.Polymod.init({modRoot: "mods", dirs: ['introMod']}); #end #if sys @@ -290,6 +290,11 @@ class TitleState extends MusicBeatState MainMenuState.firstStart = true; MainMenuState.finishedFunnyMove = false; + new FlxTimer().start(2, function(tmr:FlxTimer) + { + FlxG.switchState(new MainMenuState()); + clean(); + }); // FlxG.sound.play(Paths.music('titleShoot'), 0.7); }