aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound/music_room_handler.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2017-02-03 23:45:48 -0500
committerPaul Gilbert2017-02-03 23:45:48 -0500
commitd10ac8689071ca1916507072b5918e6bf2b26cac (patch)
tree0beac7c007efec2bf13d7ec23abe4ee915996b61 /engines/titanic/sound/music_room_handler.cpp
parent529680e6f87a6d541635e9761b6ad234dea7094a (diff)
downloadscummvm-rg350-d10ac8689071ca1916507072b5918e6bf2b26cac.tar.gz
scummvm-rg350-d10ac8689071ca1916507072b5918e6bf2b26cac.tar.bz2
scummvm-rg350-d10ac8689071ca1916507072b5918e6bf2b26cac.zip
TITANIC: Implemented CMusicObject initialization
Diffstat (limited to 'engines/titanic/sound/music_room_handler.cpp')
-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 2a6a438aa8..5cd02018c4 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -84,7 +84,7 @@ void CMusicRoomHandler::setVolume(int volume) {
if (ins1._directionControl == ins2._directionControl) {
_array4[idx] = 0;
} else {
- _array4[idx] = _array3[idx]->_field4;
+ _array4[idx] = _array3[idx]->size();
}
_array6[idx] = _array4[idx];
@@ -240,7 +240,7 @@ void CMusicRoomHandler::fn1() {
CMusicWave *musicWave = _musicWaves[idx];
// Is this about checking playback position?
- if (_array6[idx] < 0 || ins1._muteControl || _array6[idx] >= _array3[idx]->_field4) {
+ if (_array6[idx] < 0 || ins1._muteControl || _array6[idx] >= _array3[idx]->size()) {
_array6[idx] = -1;
continue;
}