Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions source/funkin/backend/MusicBeatState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import funkin.backend.system.GraphicCacheSprite;
import funkin.backend.system.framerate.Framerate;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.backend.system.interfaces.IBeatCancellableReceiver;
import funkin.menus.MainMenuState;
import funkin.options.PlayerSettings;

/**
Expand Down Expand Up @@ -166,6 +167,12 @@ class MusicBeatState extends FlxState implements IBeatCancellableReceiver
FlxG.resetState();
}

if (FlxG.keys.justPressed.F1 && FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.SHIFT) {
Logs.trace("Returning to Main Menu...", INFO, YELLOW);
FlxG.switchState(new MainMenuState());
return;
}

if (subState != null)
subState.tryUpdate(elapsed);
}
Expand Down
8 changes: 8 additions & 0 deletions source/funkin/backend/MusicBeatSubstate.hx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import funkin.backend.system.Controls;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.backend.system.interfaces.IBeatCancellableReceiver;
import funkin.options.PlayerSettings;
import funkin.menus.MainMenuState;

/**
* Base class for all the sub states.
Expand Down Expand Up @@ -153,6 +154,13 @@ class MusicBeatSubstate extends FlxSubState implements IBeatCancellableReceiver
resetSubState();
}


if (FlxG.keys.justPressed.F1 && FlxG.keys.pressed.CONTROL && FlxG.keys.pressed.SHIFT) {
Logs.trace("Returning to Main Menu...", INFO, YELLOW);
FlxG.switchState(new MainMenuState());
return;
}

if (subState != null)
subState.tryUpdate(elapsed);
}
Expand Down