aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2017-09-16 17:57:37 -0400
committerPaul Gilbert2017-09-16 17:57:37 -0400
commit7a1d359342579d0d48c59d120ec734d215cd73c8 (patch)
tree876d4e875d6a549d121bc05c4411f4b9639dde78
parenta9316560ab896fb7198b74f2ce8437177ddf0201 (diff)
downloadscummvm-rg350-7a1d359342579d0d48c59d120ec734d215cd73c8.tar.gz
scummvm-rg350-7a1d359342579d0d48c59d120ec734d215cd73c8.tar.bz2
scummvm-rg350-7a1d359342579d0d48c59d120ec734d215cd73c8.zip
TITANIC: Fix music playback in music room
-rw-r--r--engines/titanic/sound/music_room_handler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index ffc90ffca6..5c1cd6012d 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -218,9 +218,9 @@ void CMusicRoomHandler::updateAudio() {
// Iterate through each of the four instruments and do an additive
// read that will merge their data onto the output buffer
for (count = size, ptr = audioData; count > 0; ) {
- int amount = musicWave->read(ptr, count);
+ int amount = musicWave->read(ptr, count * 2);
if (amount > 0) {
- count -= amount;
+ count -= amount / sizeof(uint16);
ptr += amount / sizeof(uint16);
} else if (!pollInstrument(instrument)) {
--_instrumentsActive;