aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2011-08-04 08:35:24 +1000
committerPaul Gilbert2011-08-04 08:35:24 +1000
commit5f2402bd36d98378b73aab4f12f44379e441b533 (patch)
tree4d6269081058aafa5321edd8f2c631b1a3a5b8af
parentb9fe3c151fe2a02b596b6366b296ea67023dae94 (diff)
downloadscummvm-rg350-5f2402bd36d98378b73aab4f12f44379e441b533.tar.gz
scummvm-rg350-5f2402bd36d98378b73aab4f12f44379e441b533.tar.bz2
scummvm-rg350-5f2402bd36d98378b73aab4f12f44379e441b533.zip
TSAGE: Fix incorrect sample data being used in _soPlaySound2.
This fixes the playback of the Intruder Alert message in Scene #95.
-rw-r--r--engines/tsage/sound.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 1754bd71b9..2121526498 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -2176,13 +2176,14 @@ void Sound::_soPlaySound2(VoiceTypeStruct *vtStruct, const byte *channelData, in
if (entryIndex != -1) {
SoundDriver *driver = vtStruct->_entries[entryIndex]._driver;
assert(driver);
+ byte *trackData = _channelData[trackCtr];
vtStruct->_entries[entryIndex]._type1._field6 = 0;
vtStruct->_entries[entryIndex]._type1._field4 = v0;
vtStruct->_entries[entryIndex]._type1._field5 = 0;
int v1, v2;
- driver->playSound(channelData, 14, -1, vtStruct->_entries[entryIndex]._voiceNum, v0, 0x7F);
+ driver->playSound(trackData, 14, -1, vtStruct->_entries[entryIndex]._voiceNum, v0, 0x7F);
driver->proc42(vtStruct->_entries[entryIndex]._voiceNum, voiceType, 0, &v1, &v2);
}
break;