aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorGregory Montoir2007-01-05 23:51:50 +0000
committerGregory Montoir2007-01-05 23:51:50 +0000
commitef2d914742ae61b5f1cb0b39349d6bc14a19b495 (patch)
tree65cff328246db41f6df7d90c86746dc94f5c29e7 /engines
parentcd79d127fadbdff767e59ffab0eff734efe7b23f (diff)
downloadscummvm-rg350-ef2d914742ae61b5f1cb0b39349d6bc14a19b495.tar.gz
scummvm-rg350-ef2d914742ae61b5f1cb0b39349d6bc14a19b495.tar.bz2
scummvm-rg350-ef2d914742ae61b5f1cb0b39349d6bc14a19b495.zip
Enabled exit from in-game options
svn-id: r25017
Diffstat (limited to 'engines')
-rw-r--r--engines/touche/ui.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/touche/ui.cpp b/engines/touche/ui.cpp
index 4136e9baf8..bbfec64675 100644
--- a/engines/touche/ui.cpp
+++ b/engines/touche/ui.cpp
@@ -87,6 +87,7 @@ struct MenuData {
Button *buttonsTable;
uint buttonsCount;
bool quit;
+ bool exit;
bool saveLoadMarks[100];
char saveLoadDescriptionsTable[100][33];
@@ -355,6 +356,7 @@ void ToucheEngine::handleOptions(int forceDisplay) {
MenuData menuData;
memset(&menuData, 0, sizeof(MenuData));
menuData.quit = false;
+ menuData.exit = false;
menuData.mode = kMenuSettingsMode;
int curMode = -1;
while (!menuData.quit) {
@@ -380,6 +382,8 @@ void ToucheEngine::handleOptions(int forceDisplay) {
switch (event.type) {
case OSystem::EVENT_QUIT:
menuData.quit = true;
+ menuData.exit = true;
+ _flagsTable[611] = 1;
break;
case OSystem::EVENT_LBUTTONDOWN:
button = menuData.findButtonUnderCursor(event.mouse.x, event.mouse.y);
@@ -411,7 +415,7 @@ void ToucheEngine::handleOptions(int forceDisplay) {
_system->delayMillis(50);
}
_fullRedrawCounter = 2;
- if (_flagsTable[611] != 0) {
+ if (!menuData.exit && _flagsTable[611] != 0) {
_flagsTable[611] = displayQuitDialog();
}
}