From 531ebab4da814aac23a9b084772a6156bfb3b9b8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 8 Apr 2014 22:04:43 -0400
Subject: MADS: Added preliminary keyboard handling and keypress process stub

---
 engines/mads/dialogs.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines/mads/dialogs.cpp')

diff --git a/engines/mads/dialogs.cpp b/engines/mads/dialogs.cpp
index 23015413b8..8bc73e55dc 100644
--- a/engines/mads/dialogs.cpp
+++ b/engines/mads/dialogs.cpp
@@ -331,11 +331,13 @@ void TextDialog::show() {
 	// Wait for mouse click
 	do {
 		_vm->_events->waitForNextFrame();
-	} while (!_vm->shouldQuit() && !_vm->_events->_mouseReleased);
+	} while (!_vm->shouldQuit() && !_vm->_events->isKeyPressed() && !_vm->_events->_mouseReleased);
 
-	// Allow the mouse release to be gobbled up
-	if (!_vm->shouldQuit())
+	// Allow the mouse release or keypress to be gobbled up
+	if (!_vm->shouldQuit()) {
 		_vm->_events->waitForNextFrame();
+		_vm->_events->_pendingKeys.clear();
+	}
 }
 
 /*------------------------------------------------------------------------*/
-- 
cgit v1.2.3