Merge pull request #245 from cortex-command-community/options-esc

Pressing escape at various main menu screens no longer quits the game.

Author: garethyr

CHANGELOG.md

@@ -256,6 +256,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - 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.
 
+- Pressing escape at the options, mod manager, game editors and credits screens no longer quits the game.
+
 ### Removed
 
 - Removed the ability to remove scripts from objects with Lua. This is no longer needed cause of code efficiency increases.

Menus/MainMenuGUI.cpp

@@ -635,8 +635,28 @@ void MainMenuGUI::Update()
         return;
 
     // If esc pressed, show quit dialog if applicable
-    if (g_UInputMan.KeyPressed(KEY_ESC))
-        QuitLogic();
+	if (g_UInputMan.KeyPressed(KEY_ESC)) {
+		if (m_MenuScreen == OPTIONSSCREEN || m_MenuScreen == MODMANAGERSCREEN || m_MenuScreen == EDITORSCREEN || m_MenuScreen == CREDITSSCREEN) {
+			HideAllScreens();
+			m_MainMenuButtons[BACKTOMAIN]->SetVisible(false);
+			m_MenuScreen = MAINSCREEN;
+			m_ScreenChange = true;
+			g_GUISound.BackButtonPressSound()->Play();
+
+			if (m_MenuScreen == OPTIONSSCREEN) {
+				g_SettingsMan.SetFlashOnBrainDamage(m_aOptionsCheckbox[FLASHONBRAINDAMAGE]->GetCheck());
+				g_SettingsMan.SetBlipOnRevealUnseen(m_aOptionsCheckbox[BLIPONREVEALUNSEEN]->GetCheck());
+				g_SettingsMan.SetShowForeignItems(m_aOptionsCheckbox[SHOWFOREIGNITEMS]->GetCheck());
+				g_SettingsMan.SetShowToolTips(m_aOptionsCheckbox[SHOWTOOLTIPS]->GetCheck());
+				g_SettingsMan.SetPreciseCollisions(m_aOptionsCheckbox[PRECISECOLLISIONS]->GetCheck());
+				g_SettingsMan.UpdateSettingsFile();
+			} else if (m_MenuScreen == MODMANAGERSCREEN) {
+				g_SettingsMan.UpdateSettingsFile();
+			}
+		} else {
+			QuitLogic();
+		}
+	}
 
     ////////////////////////////////////////////////////////////////////////
     // Animate the menu into and out of view if enabled or disabled