Removed reloading

This commit is contained in:
Ne_Eo
2024-07-21 23:19:39 +02:00
parent 789d4864c8
commit b31561eb43
6 changed files with 17 additions and 3 deletions
+1 -1
View File
@@ -37,7 +37,7 @@
<cmd inLib="lime" >
<line>cd tools</line>
<line>haxe tools.hxml</line>
<line>cd ..</line>s
<line>cd ..</line>
</cmd>
</if>
</libraries>
+4 -2
View File
@@ -157,8 +157,6 @@
<haxedef name="SOFTCODED_CLASSES" if="SOFTCODED_CLASSES" />
<haxedef name="openfl_dpi_aware" if="openfl_dpi_aware" />
<haxedef name="EXPERIMENTAL_FLXGRAPHIC_DESTROY_FIX" />
<!-- _______________________________ Libraries ______________________________ -->
<!-- KEEP BOTH OF THESE AS THERE ARE SOME PARTICULAR CASES! -->
@@ -197,4 +195,8 @@
<haxedef name="HXCPP_DEBUG_LINK" if="release" />
<haxedef name="hscriptPos" /> <!-- for logging -->
<!-- EXPERMENTAL FEATURES -->
<!-- <haxedef name="EXPERMENTAL_SCRIPT_RELOADING" /> -->
<haxedef name="EXPERIMENTAL_FLXGRAPHIC_DESTROY_FIX" />
</project>
+4
View File
@@ -127,7 +127,9 @@ class MusicBeatState extends FlxState implements IBeatReceiver
script.load();
}
}
#if EXPERMENTAL_SCRIPT_RELOADING
else stateScripts.reload();
#end
}
}
@@ -182,9 +184,11 @@ class MusicBeatState extends FlxState implements IBeatReceiver
override function update(elapsed:Float)
{
// TODO: DEBUG MODE!!
#if EXPERMENTAL_SCRIPT_RELOADING
if (FlxG.keys.justPressed.F5) {
loadScript();
}
#end
call("update", [elapsed]);
super.update(elapsed);
@@ -114,7 +114,9 @@ class MusicBeatSubstate extends FlxSubState implements IBeatReceiver
script.load();
}
}
#if EXPERMENTAL_SCRIPT_RELOADING
else stateScripts.reload();
#end
}
}
@@ -171,10 +173,12 @@ class MusicBeatSubstate extends FlxSubState implements IBeatReceiver
override function update(elapsed:Float)
{
#if EXPERMENTAL_SCRIPT_RELOADING
// TODO: DEBUG MODE!!
if (FlxG.keys.justPressed.F5) {
loadScript();
}
#end
call("update", [elapsed]);
super.update(elapsed);
}
@@ -42,6 +42,7 @@ class GlobalScript {
});
FlxG.signals.postUpdate.add(function() {
call("postUpdate", [FlxG.elapsed]);
#if EXPERMENTAL_SCRIPT_RELOADING
if (FlxG.keys.justPressed.F5) {
if (scripts.scripts.length > 0) {
Logs.trace('Reloading global script...', WARNING, YELLOW);
@@ -52,6 +53,7 @@ class GlobalScript {
onModSwitch(#if MOD_SUPPORT ModsFolder.currentModFolder #else null #end);
}
}
#end
if (FlxG.keys.justPressed.F2)
NativeAPI.allocConsole();
});
+2
View File
@@ -1237,11 +1237,13 @@ class PlayState extends MusicBeatState
if (chartingMode && FlxG.keys.justPressed.SEVEN) {
FlxG.switchState(new funkin.editors.charter.Charter(SONG.meta.name, difficulty, false));
}
#if EXPERMENTAL_SCRIPT_RELOADING
if (FlxG.keys.justPressed.F5) {
Logs.trace('[PlayState] Reloading scripts...', WARNING, YELLOW);
scripts.reload();
Logs.trace('[PlayState] Song scripts successfully reloaded.', WARNING, GREEN);
}
#end
}
if (doIconBop) {