From 2a8166dde54a164a408453cf31730906ae2bc378 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 16 Dec 2007 08:10:47 +0000
Subject: Changed delay method to not break when a modifier key is pressed

svn-id: r29870
---
 engines/lure/animseq.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

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);
 
-- 
cgit v1.2.3