diff --git a/funkinscsource/slushi/substates/DebugSubState.hx b/funkinscsource/slushi/substates/DebugSubState.hx index c4d624f..e43fcca 100644 --- a/funkinscsource/slushi/substates/DebugSubState.hx +++ b/funkinscsource/slushi/substates/DebugSubState.hx @@ -150,13 +150,13 @@ class DebugSubState extends MusicBeatSubState }); } - if (FlxG.keys.pressed.F3 && FlxG.keys.pressed.C && !Application.current.window.maximized) + if (FlxG.keys.pressed.F3 && FlxG.keys.pressed.C && !Application.current.window.maximized && !Application.current.window.fullscreen) { #if windows CppAPI.centerWindow(); #else - setWinPositionInX(Std.int((getScreenSizeInWidth() - getWindowSizeInWidth()) / 2)); - setWinPositionInY(Std.int((getScreenSizeInHeight() - getWindowSizeInHeight()) / 2)); + WindowFuncs.setWinPositionInX(Std.int((WindowFuncs.getScreenSizeInWidth() - WindowFuncs.getWindowSizeInWidth()) / 2)); + WindowFuncs.setWinPositionInY(Std.int((WindowFuncs.getScreenSizeInHeight() - WindowFuncs.getWindowSizeInHeight()) / 2)); #end } diff --git a/funkinscsource/states/editors/WeekEditorState.hx b/funkinscsource/states/editors/WeekEditorState.hx index c40ee6d..4db3973 100644 --- a/funkinscsource/states/editors/WeekEditorState.hx +++ b/funkinscsource/states/editors/WeekEditorState.hx @@ -810,13 +810,16 @@ class WeekEditorFreeplayState extends MusicBeatState implements PsychUIEventHand else { ClientPrefs.toggleVolumeKeys(true); - if (!WeekEditorState.unsavedProgress) - { - MusicBeatState.switchState(new MasterEditorMenu()); - FlxG.sound.playMusic(SlushiMain.getSLEPath("Musics/SLE_HackNet_Resonance.ogg")); + if(FlxG.keys.justPressed.ESCAPE) { + if (!WeekEditorState.unsavedProgress) + { + MusicBeatState.switchState(new MasterEditorMenu()); + FlxG.sound.playMusic(SlushiMain.getSLEPath("Musics/SLE_HackNet_Resonance.ogg")); + } + else { + openSubState(new ExitConfirmationPrompt()); + } } - else - openSubState(new ExitConfirmationPrompt()); if (controls.UI_UP_P) changeSelection(-1); if (controls.UI_DOWN_P) changeSelection(1); diff --git a/gitVersion.json b/gitVersion.json index 14d4cd6..04e6d5f 100644 --- a/gitVersion.json +++ b/gitVersion.json @@ -1,3 +1,3 @@ { - "engineVersion": "0.3.4" + "engineVersion": "0.3.5" } \ No newline at end of file