Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit ae2b48d

Browse files
committed
Same for mod manager, game editors and credits screens.
1 parent bce35de commit ae2b48d

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
256256

257257
- The "woosh" sound played when switching actors from a distance will now take scene wrapping into account. Additionally, attempting to switch to previous or next actor with only one actor will play the more correct "error" sound.
258258

259-
- Pressing escape at the options screen no longer quits the game.
259+
- Pressing escape at the options, mod manager, game editors and credits screens no longer quits the game.
260260

261261
### Removed
262262

Menus/MainMenuGUI.cpp

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -636,9 +636,7 @@ void MainMenuGUI::Update()
636636

637637
// If esc pressed, show quit dialog if applicable
638638
if (g_UInputMan.KeyPressed(KEY_ESC)) {
639-
if (m_MenuScreen != OPTIONSSCREEN) {
640-
QuitLogic();
641-
} else {
639+
if (m_MenuScreen == OPTIONSSCREEN) {
642640
HideAllScreens();
643641
m_MainMenuButtons[BACKTOMAIN]->SetVisible(false);
644642

@@ -653,6 +651,24 @@ void MainMenuGUI::Update()
653651
m_ScreenChange = true;
654652

655653
g_GUISound.BackButtonPressSound()->Play();
654+
} else if (m_MenuScreen == MODMANAGERSCREEN) {
655+
g_SettingsMan.UpdateSettingsFile();
656+
657+
HideAllScreens();
658+
m_MenuScreen = MAINSCREEN;
659+
m_ScreenChange = true;
660+
661+
g_GUISound.BackButtonPressSound()->Play();
662+
} else if (m_MenuScreen == EDITORSCREEN || m_MenuScreen == CREDITSSCREEN) {
663+
HideAllScreens();
664+
m_MainMenuButtons[BACKTOMAIN]->SetVisible(false);
665+
666+
m_MenuScreen = MAINSCREEN;
667+
m_ScreenChange = true;
668+
669+
g_GUISound.BackButtonPressSound()->Play();
670+
} else {
671+
QuitLogic();
656672
}
657673
}
658674

0 commit comments

Comments
 (0)