From cbfa0a0640eeeb2c86edd9c8d4f3e5925c437e05 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 18 Nov 2017 00:21:35 +0100
Subject: SUPERNOVA: Fix some TODOs

---
 engines/supernova/rooms.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp
index 96e8eaf7d6..3c3ef9481d 100644
--- a/engines/supernova/rooms.cpp
+++ b/engines/supernova/rooms.cpp
@@ -2299,12 +2299,18 @@ bool ArsanoMeetup3::interact(Action verb, Object &obj1, Object &obj2) {
 		_gm->wait2(6);
 		_vm->renderImage(4);
 		_vm->playSound(kAudioGunShot);
-		// TODO: wait until audio finished playing
+
+		while (_vm->_mixer->isSoundHandleActive(_vm->_soundHandle))
+			_gm->wait2(1);
+
 		_vm->renderImage(5);
 		_gm->wait2(3);
 		_vm->renderImage(4);
 		_vm->playSound(kAudioGunShot);
-		// TODO: wait until audio finished playing
+
+		while (_vm->_mixer->isSoundHandleActive(_vm->_soundHandle))
+			_gm->wait2(1);
+
 		_vm->renderImage(5);
 		_vm->paletteFadeOut();
 		_gm->wait2(12);
@@ -2533,7 +2539,10 @@ bool AxacussCell::interact(Action verb, Object &obj1, Object &obj2) {
 		if (isSectionVisible(30) || isSectionVisible(29))
 			return false;
 		_vm->playSound(kAudioGunShot);
-		// TODO: wait till sound is played
+
+		while (_vm->_mixer->isSoundHandleActive(_vm->_soundHandle))
+			_gm->wait2(1);
+
 		_vm->playSound(kAudioGunShot);
 		_vm->playSound(kAudioGunShot);
 		_gm->dead(kStringAxacussCell_4);
-- 
cgit v1.2.3