hello

AstroEngineDevs · Aug 28, 2024 · fda7c5f · fda7c5f
1 parent d6f6944
commit fda7c5f
Show file tree

Hide file tree

Showing 10 changed files with 731 additions and 342 deletions.
diff --git a/source/funkin/backend/data/WeekData.hx b/source/funkin/backend/data/WeekData.hx
@@ -6,7 +6,6 @@ import sys.FileSystem;
 #end
 import lime.utils.Assets;
 import funkin.game.states.PlayState;
-import openfl.utils.Assets as OpenFlAssets;
 import haxe.Json;
 import haxe.format.JsonParser;
 

diff --git a/source/funkin/backend/funkinLua/FunkinLua.hx b/source/funkin/backend/funkinLua/FunkinLua.hx
@@ -608,26 +608,26 @@ class FunkinLua
 			#end
 		});
 
-		Lua_helper.add_callback(lua, "loadSong", function(?name:String = null, ?difficultyNum:Int = -1)
-		{
-			if (name == null || name.length < 1)
-				name = PlayState.SONG.song;
+		Lua_helper.add_callback(lua, "loadSong", function(?name:String = null, ?difficultyNum:Int = -1) {
+			if(name == null || name.length < 1)
+				name = Song.loadedSongName;
 			if (difficultyNum == -1)
 				difficultyNum = PlayState.storyDifficulty;
 
 			var poop = Highscore.formatSong(name, difficultyNum);
-			PlayState.SONG = Song.loadFromJson(poop, name);
+			Song.loadFromJson(poop, name);
 			PlayState.storyDifficulty = difficultyNum;
-			game.persistentUpdate = false;
+			FlxG.state.persistentUpdate = false;
 			LoadingState.loadAndSwitchState(new PlayState());
 
 			FlxG.sound.music.pause();
 			FlxG.sound.music.volume = 0;
-			if (game.vocals != null)
+			if(game != null && game.vocals != null)
 			{
 				game.vocals.pause();
 				game.vocals.volume = 0;
 			}
+			FlxG.camera.followLerp = 0;
 		});
 
 		Lua_helper.add_callback(lua, "loadGraphic", function(variable:String, image:String, ?gridX:Int = 0, ?gridY:Int = 0)

diff --git a/source/funkin/backend/handlers/CutsceneHandler.hx b/source/funkin/backend/handlers/CutsceneHandler.hx
@@ -4,7 +4,6 @@ import flixel.FlxBasic;
 import flixel.util.FlxSort;
 import flixel.util.FlxDestroyUtil;
 import flixel.addons.display.FlxPieDial;
-
 typedef CutsceneEvent = {
 	var time:Float;
 	var func:Void->Void;
@@ -74,7 +73,6 @@ class CutsceneHandler extends FlxBasic
 
 		if(_canSkip && cutsceneTime > 0.1)
 		{
-			@:privateAccess
 			if(Controls.instance.pressed('accept'))
 				holdingTime = Math.max(0, Math.min(_timeToSkip, holdingTime + elapsed));
 			else if (holdingTime > 0)

diff --git a/source/funkin/game/FPS.hx b/source/funkin/game/FPS.hx
@@ -77,11 +77,12 @@ class FPS extends TextField
 
 			var memoryMegas:Float = 0;
 
-			#if openfl
+		/*	#if openfl
 			memoryMegas = Math.abs(FlxMath.roundDecimal(System.totalMemory / 1000000, 1));
 			text += "\nMemory: " + memoryMegas + " MB";
 			#end
 			text += '\nAstro Engine: ' + EngineData.engineData.coreVersion;
+		*/
 			#if debug 
 			text += '\nCommit: ${CommitMacro.commitNumber} [${CommitMacro.commitHash}]'; 
 			#end