Ticket #8664: timed-message.patch

gui/message.h

@@ -48 +48 @@
  */
 class TimedMessageDialog : public MessageDialog {
 public:
-        TimedMessageDialog(const Common::String &message, uint32 duration);
+        TimedMessageDialog(const Common::String &message, uint32 duration, bool interruptable = false);
 
         void handleTickle();
+        void handleMouseDown(int x, int y, int button, int clickCount) { if (_interruptable) close(); }
+        void handleKeyDown(uint16 ascii, int keycode, int modifiers) { if (_interruptable) close(); }
 
 protected:
         uint32 _timer;
+        bool _interruptable;
 };
 
 } // End of namespace GUI

gui/message.cpp

@@ -112 +112 @@
         }
 }
 
-TimedMessageDialog::TimedMessageDialog(const Common::String &message, uint32 duration)
+TimedMessageDialog::TimedMessageDialog(const Common::String &message, uint32 duration, bool interruptable)
         : MessageDialog(message, 0, 0) {
         _timer = getMillis() + duration;
+        _interruptable = interruptable;
 }
 
 void TimedMessageDialog::handleTickle() {

engines/scumm/input.cpp

@@ -431 +431 @@
                 if (VAR_VOICE_MODE != 0xFF)
                         VAR(VAR_VOICE_MODE) = _voiceMode;
 
-                GUI::TimedMessageDialog dialog(buf, 1500);
+                GUI::TimedMessageDialog dialog(buf, 1500, true);
                 runDialog(dialog);
                 return;
         }