[Scummvm-cvs-logs] scummvm master -> 5f2402bd36d98378b73aab4f12f44379e441b533

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5f2402bd36 TSAGE: Fix incorrect sample data being used in _soPlaySound2.


Commit: 5f2402bd36d98378b73aab4f12f44379e441b533
    https://github.com/scummvm/scummvm/commit/5f2402bd36d98378b73aab4f12f44379e441b533
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-03T15:35:24-07:00

Commit Message:
TSAGE: Fix incorrect sample data being used in _soPlaySound2.

This fixes the playback of the Intruder Alert message in Scene #95.

Changed paths:
    engines/tsage/sound.cpp



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 1754bd7..2121526 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;