From 637dedeb9acbd0c024a84f8d1b6fc04f33ceeacc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 16 Mar 2018 22:32:22 -0400
Subject: XEEN: Fixes to death cutscene

---
 engines/xeen/worldofxeen/worldofxeen.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/xeen/worldofxeen/worldofxeen.cpp b/engines/xeen/worldofxeen/worldofxeen.cpp
index 962bdfec6a..2410a29baa 100644
--- a/engines/xeen/worldofxeen/worldofxeen.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen.cpp
@@ -71,7 +71,7 @@ void WorldOfXeenEngine::death() {
 		}
 
 		w.update();
-		_events->wait(1);
+		_events->wait(1, false);
 	}
 
 	deathSprites.draw(0, 34, Common::Point(0, 0));
@@ -79,7 +79,7 @@ void WorldOfXeenEngine::death() {
 	w.update();
 	savedBg.blitFrom(*_screen);
 
-	_sound->playSong(_files->_isDarkCc ? "laff1.voc" : "xeenlaff.voc");
+	_sound->playSound(_files->_isDarkCc ? "laff1.voc" : "xeenlaff.voc");
 
 	// Animation of Xeen or Alamar laughing
 	for (int idx = 0, idx2 = 0; idx < (_files->_isDarkCc ? 10 : 23); ++idx) {
@@ -91,11 +91,11 @@ void WorldOfXeenEngine::death() {
 		w.update();
 
 		if (_files->_isDarkCc) {
-			_events->wait(2);
+			_events->wait(2, false);
 		} else {
 			if (idx == 1 || idx == 11)
 				_sound->playFX(33);
-			_events->wait(2);
+			_events->wait(2, false);
 			if (idx == 15)
 				_sound->playFX(34);
 		}
@@ -111,6 +111,9 @@ void WorldOfXeenEngine::death() {
 			idx = 23;
 	}
 
+	while (_sound->isSoundPlaying())
+		_events->wait(1, false);
+
 	_screen->blitFrom(savedBg);
 	w.update();
 }
-- 
cgit v1.2.3