Skip to content

Commit

Permalink
Fixed bug in Week Editor State and others things
Browse files Browse the repository at this point in the history
Fixed bug in Week Editor State when you go to the freeplay option
Fixed mini error in Linux or MacOS compilation
Changed engine version in gitVersion.json
  • Loading branch information
Slushi-Github committed Sep 9, 2024
1 parent bbf6ecf commit 407f6ef
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
6 changes: 3 additions & 3 deletions funkinscsource/slushi/substates/DebugSubState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
15 changes: 9 additions & 6 deletions funkinscsource/states/editors/WeekEditorState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion gitVersion.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"engineVersion": "0.3.4"
"engineVersion": "0.3.5"
}

0 comments on commit 407f6ef

Please sign in to comment.