aboutsummaryrefslogtreecommitdiff
path: root/engines/lure
diff options
context:
space:
mode:
authorPaul Gilbert2007-12-16 08:10:47 +0000
committerPaul Gilbert2007-12-16 08:10:47 +0000
commit2a8166dde54a164a408453cf31730906ae2bc378 (patch)
treeca5be7277cb60d66db71eb3c909bbc394818af20 /engines/lure
parenta9ced688bc02a69ddcbfb8fce8ab3b9c5983d06a (diff)
downloadscummvm-rg350-2a8166dde54a164a408453cf31730906ae2bc378.tar.gz
scummvm-rg350-2a8166dde54a164a408453cf31730906ae2bc378.tar.bz2
scummvm-rg350-2a8166dde54a164a408453cf31730906ae2bc378.zip
Changed delay method to not break when a modifier key is pressed
svn-id: r29870
Diffstat (limited to 'engines/lure')
-rw-r--r--engines/lure/animseq.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/lure/animseq.cpp b/engines/lure/animseq.cpp
index 83640d6ef8..66a980c6b6 100644
--- a/engines/lure/animseq.cpp
+++ b/engines/lure/animseq.cpp
@@ -42,7 +42,7 @@ AnimAbortType AnimationSequence::delay(uint32 milliseconds) {
while (g_system->getMillis() < delayCtr) {
while (events.pollEvent()) {
- if (events.type() == Common::EVENT_KEYDOWN) {
+ if ((events.type() == Common::EVENT_KEYDOWN) && (events.event().kbd.ascii != 0)) {
if (events.event().kbd.keycode == Common::KEYCODE_ESCAPE) return ABORT_END_INTRO;
else return ABORT_NEXT_SCENE;
} else if (events.type() == Common::EVENT_LBUTTONDOWN)
@@ -140,7 +140,9 @@ AnimAbortType AnimationSequence::show() {
// Loop through displaying the animations
while ((_pPixels < _pPixelsEnd) && (_pLines < _pLinesEnd)) {
if ((soundFrame != NULL) && (frameCtr == 0))
- Sound.musicInterface_Play(soundFrame->soundId, soundFrame->channelNum);
+ Sound.musicInterface_Play(
+ Sound.isRoland() ? soundFrame->rolandSoundId : soundFrame->adlibSoundId,
+ soundFrame->channelNum);
decodeFrame(_pPixels, _pLines);