[Scummvm-cvs-logs] SF.net SVN: scummvm: [25017] scummvm/trunk/engines/touche/ui.cpp

[cyx at users.sourceforge.net]

Revision: 25017
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25017&view=rev
Author:   cyx
Date:     2007-01-05 15:51:50 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
Enabled exit from in-game options

Modified Paths:
--------------
    scummvm/trunk/engines/touche/ui.cpp

Modified: scummvm/trunk/engines/touche/ui.cpp
===================================================================
--- scummvm/trunk/engines/touche/ui.cpp	2007-01-05 23:47:08 UTC (rev 25016)
+++ scummvm/trunk/engines/touche/ui.cpp	2007-01-05 23:51:50 UTC (rev 25017)
@@ -87,6 +87,7 @@
 	Button *buttonsTable;
 	uint buttonsCount;
 	bool quit;
+	bool exit;
 	bool saveLoadMarks[100];
 	char saveLoadDescriptionsTable[100][33];
 
@@ -355,6 +356,7 @@
 		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 @@
 				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 @@
 			_system->delayMillis(50);
 		}
 		_fullRedrawCounter = 2;
-		if (_flagsTable[611] != 0) {
+		if (!menuData.exit && _flagsTable[611] != 0) {
 			_flagsTable[611] = displayQuitDialog();
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.