From 01bfaaa76544856f476c928f11448831de43f6d0 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 23 Sep 2007 22:14:45 +0000
Subject: Split up the interruptableDelay method into two methods, making the
 version in events.cpp more generic

svn-id: r29070
---
 engines/lure/events.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/lure/events.cpp')

diff --git a/engines/lure/events.cpp b/engines/lure/events.cpp
index 68dc808392..c93ae257e9 100644
--- a/engines/lure/events.cpp
+++ b/engines/lure/events.cpp
@@ -205,10 +205,9 @@ bool Events::interruptableDelay(uint32 milliseconds) {
 		if (events.quitFlag) return true;
 
 		if (events.pollEvent()) {
-			if (events.type() == Common::EVENT_KEYDOWN)
-				return events.event().kbd.keycode == 27;
-			else if (events.type() == Common::EVENT_LBUTTONDOWN)
-				return false;
+			if ((events.type() == Common::EVENT_KEYDOWN) ||
+				(events.type() == Common::EVENT_LBUTTONDOWN))
+				return true;
 		}
 
 		uint32 delayAmount = delayCtr - g_system->getMillis();
-- 
cgit v1.2.3