Ticket #8148: mi-cheat.diff

scummvm/scumm/dialogs.h

@@ -120 +120 @@
                 { close(); }
         virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers)
                 {
-                        if (ascii == ' ')  // Close pause dialog if space key is pressed
-                                close();
-                        else
-                                ScummDialog::handleKeyDown(ascii, keycode, modifiers);
+                        setResult(ascii);
+                        close();
                 }
 protected:
         void setInfoText (const String& message);
@@ -132 +130 @@
 class PauseDialog : public InfoDialog {
 public:
         PauseDialog(NewGui *gui, Scumm *scumm);
+        virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers)
+                {
+                        if (ascii == ' ')  // Close pause dialog if space key is pressed
+                                close();
+                        else
+                                ScummDialog::handleKeyDown(ascii, keycode, modifiers);
+                }
 };
 
 #ifdef _WIN32_WCE

scummvm/scumm/scumm.h

@@ -953 +953 @@
 #endif
 
         /* Scumm Vars */
+        byte VAR_KEYPRESS;
         byte VAR_EGO;
         byte VAR_CAMERA_POS_X;
         byte VAR_HAVE_MSG;

scummvm/scumm/scummvm.cpp

@@ -1397 +1397 @@
                                                 resourceStats();
                                         else
                                                 _keyPressed = event.kbd.ascii;  // Normal key press, pass on to the game.
+                                } else if (event.kbd.flags==(OSystem::KBD_CTRL | OSystem::KBD_ALT)) {
+                                        // I don't know if this is correct, but
+                                        // I do know that Ctrl-Alt-W should be
+                                        // 273, because that's what MI2 checks
+                                        // for in its "instant win" cheat.
+                                        _keyPressed = event.kbd.ascii + 250;
                                 } else
                                         _keyPressed = event.kbd.ascii;  // Normal key press, pass on to the game.
                                 break;

scummvm/scumm/string.cpp

@@ -425 +425 @@
                 _string[3].color = 4;
 
         InfoDialog* dialog = new InfoDialog(_newgui, this, (char*)buf);
-        runDialog (dialog);
+        // FIXME: I know this is the right thing to do for MI1 and MI2. For
+        // all other games it's just a guess.
+        _vars[VAR_KEYPRESS] = runDialog (dialog);
         delete dialog;
 
         _messagePtr = tmp;

scummvm/scumm/vars.cpp

@@ -26 +26 @@
 
 void Scumm::setupScummVars()
 {
+        VAR_KEYPRESS = 0;
         VAR_EGO = 1;
         VAR_CAMERA_POS_X = 2;
         VAR_HAVE_MSG = 3;
@@ -113 +114 @@
 
 void Scumm_v7::setupScummVars()
 {
+        VAR_KEYPRESS = 0;
         VAR_MOUSE_X = 1;
         VAR_MOUSE_Y = 2;
         VAR_VIRT_MOUSE_X = 3;