Ticket #8194: quitdialog.2.diff

common/gameDetector.cpp

@@ -192 +192 @@
         _save_slot = 0;
         
         _saveconfig = false;
+        _confirmExit = false;
         
 #ifndef _WIN32_WCE
         _gfx_mode = GFX_DOUBLESIZE;
@@ -300 +301 @@
                 _gameTempo = strtol(val, NULL, 0);
 
         _talkSpeed = g_config->getInt("talkspeed", _talkSpeed);
+
+        _confirmExit = g_config->getBool("confirmExit", _confirmExit ? true : false);
 
         _multi_midi = g_config->getBool ("multi_midi", _multi_midi);
         _native_mt32 = g_config->getBool ("native_mt32", _native_mt32);

common/gameDetector.h

@@ -148 +148 @@
         int _save_slot;
         
         bool _saveconfig;
+        bool _confirmExit;
 
 public:
         OSystem *createSystem();

scumm/dialogs.cpp

@@ -695 +695 @@
         : InfoDialog(gui, scumm, 10) {
 }
 
+ConfirmExitDialog::ConfirmExitDialog(NewGui *gui, Scumm *scumm)
+        : InfoDialog(gui, scumm, "Are you sure you want to quit (y/n)?") {
+}
+
 #ifdef _WIN32_WCE
 
 #pragma mark -

scumm/dialogs.h

@@ -171 +171 @@
                 }
 };
 
+class ConfirmExitDialog : public InfoDialog {
+public:
+        ConfirmExitDialog(NewGui *gui, Scumm *scumm);
+        virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers) {
+                if (tolower(ascii) == 'n') { // Close exit dialog if n key is pressed
+                        setResult(ascii);
+                        close();
+                }
+                if (tolower(ascii) == 'y') { // Quit engine if y key is pressed
+                        setResult(ascii);
+                        close();
+                }
+                else
+                        ScummDialog::handleKeyDown(ascii, keycode, modifiers);
+        }
+};
+
 #ifdef _WIN32_WCE
 
 class KeysDialog : public ScummDialog {

scumm/scumm.h

@@ -390 +390 @@
         Dialog *_pauseDialog;
         Dialog *_optionsDialog;
         Dialog *_saveLoadDialog;
+        Dialog *_confirmExitDialog;
         // Debugger access this one, too...
         ConsoleDialog *_debuggerDialog;
 
@@ -397 +398 @@
         void pauseDialog();
         void saveloadDialog();
         void optionsDialog();
+        void confirmexitDialog();
         char displayError(bool showCancel, const char *message, ...);
 
 protected:
@@ -1059 +1061 @@
 
 public:
         bool _noSubtitles;      // Whether to skip all subtitles
+        bool _confirmExit;
 protected:
 
         void initCharset(int charset);

scumm/scummvm.cpp

@@ -232 +232 @@
         _pauseDialog = NULL;
         _optionsDialog = NULL;
         _saveLoadDialog = NULL;
+        _confirmExitDialog = NULL;
         _debuggerDialog = NULL;
         _fastMode = 0;
         memset(&_rnd, 0, sizeof(RandomSource));
@@ -394 +395 @@
         _charsetBufPos = 0;
         memset(_charsetBuffer, 0, sizeof(_charsetBuffer));
         _noSubtitles = false;
+        _confirmExit = false;
         _numInMsgStack = 0;
         _msgPtrToAdd = NULL;
         _messagePtr = NULL;
@@ -545 +547 @@
         setFeatures(detector->_game.features);
 
         _noSubtitles = detector->_noSubtitles;
+        _confirmExit = detector->_confirmExit;
         _defaultTalkDelay = detector->_talkSpeed;
         _use_adlib = detector->_use_adlib;
         _language = detector->_language;
@@ -709 +712 @@
         delete _pauseDialog;
         delete _optionsDialog;
         delete _saveLoadDialog;
+        delete _confirmExitDialog;
 
         delete _sound;
         delete _imuse;
@@ -1461 +1465 @@
                         break;
         
                 case OSystem::EVENT_QUIT:
+                        if(_confirmExit)
+                                confirmexitDialog();
+                        else
                         _quit = true;
                         break;
         
@@ -2295 +2302 @@
         if (!_optionsDialog)
                 _optionsDialog = new OptionsDialog(_newgui, this);
         runDialog(_optionsDialog);
+}
+
+void Scumm::confirmexitDialog() {
+        if (!_confirmExitDialog)
+                _confirmExitDialog = new ConfirmExitDialog(_newgui, this);
+
+        if (tolower(runDialog(_confirmExitDialog)) == 'y') {
+                _quit = true;
+        }
 }
 
 char Scumm::displayError(bool showCancel, const char *message, ...) {