aboutsummaryrefslogtreecommitdiff
path: root/engines/lure/events.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2007-09-23 22:14:45 +0000
committerPaul Gilbert2007-09-23 22:14:45 +0000
commit01bfaaa76544856f476c928f11448831de43f6d0 (patch)
treeab4c2587389aaf311dd9028634eef63df11cc7a5 /engines/lure/events.cpp
parent155d85b3b647378ef0b315e069de8b46ab61a11a (diff)
downloadscummvm-rg350-01bfaaa76544856f476c928f11448831de43f6d0.tar.gz
scummvm-rg350-01bfaaa76544856f476c928f11448831de43f6d0.tar.bz2
scummvm-rg350-01bfaaa76544856f476c928f11448831de43f6d0.zip
Split up the interruptableDelay method into two methods, making the version in events.cpp more generic
svn-id: r29070
Diffstat (limited to 'engines/lure/events.cpp')
-rw-r--r--engines/lure/events.cpp7
1 files changed, 3 insertions, 4 deletions
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();