Commit slighty modified patch #1865509 "KYRA: kyradat support for hof".

svn-id: r30394

1 files changed, 10 insertions, 28 deletions

diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 7315672130..ae9f3a7915 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -1086,7 +1086,7 @@ void SoundTowns_EuphonyTrackQueue::initDriver() {
 
 SoundTowns::SoundTowns(KyraEngine *vm, Audio::Mixer *mixer)
 	: Sound(vm, mixer), _lastTrack(-1), _currentSFX(0), _sfxFileData(0),
-	_sfxFileIndex((uint)-1), _sfxWDTable(0), _parser(0) {
+	_sfxFileIndex((uint)-1), _sfxWDTable(0), _sfxBTTable(0), _parser(0) {
 
 	_driver = new SoundTowns_EuphonyDriver(_mixer);
 	int ret = open();
@@ -1109,7 +1109,8 @@ SoundTowns::~SoundTowns() {
 bool SoundTowns::init() {
 	_vm->checkCD();
 	int unused = 0;
-	_sfxWDTable = _vm->staticres()->loadRawData(kKyra1TownsSFXTable, unused);
+	_sfxWDTable = _vm->staticres()->loadRawData(kKyra1TownsSFXwdTable, unused);
+	_sfxBTTable = _vm->staticres()->loadRawData(kKyra1TownsSFXbtTable, unused);
 
 	return loadInstruments();
 }
@@ -1126,8 +1127,8 @@ void SoundTowns::playTrack(uint8 track) {
 	const int32 * const tTable = (const int32 * const) cdaData();
 	int tTableIndex = 3 * track;
 
-	int trackNum = tTable[tTableIndex + 2];
-	int32 loop = tTable[tTableIndex + 1];
+	int trackNum = (int) READ_LE_UINT32(&tTable[tTableIndex + 2]);
+	int32 loop = (int32) READ_LE_UINT32(&tTable[tTableIndex + 1]);
 
 	if (track == _lastTrack && _musicEnabled)
 		return;
@@ -1138,7 +1139,7 @@ void SoundTowns::playTrack(uint8 track) {
 		AudioCD.play(trackNum+1, loop ? -1 : 1, 0, 0);
 		AudioCD.updateCD();
 	} else if (_musicEnabled) {
-		playEuphonyTrack((uint32) tTable[tTableIndex], loop);
+		playEuphonyTrack(READ_LE_UINT32(&tTable[tTableIndex]), loop);
 	}
 
 	_lastTrack = track;
@@ -1355,25 +1356,6 @@ float SoundTowns::semitoneAndSampleRate_to_sampleStep(int8 semiTone, int8 semiTo
 	return (float) sampleRate * 10.0f * rateshift / outputRate;
 }
 
-const uint8 SoundTowns::_sfxBTTable[256] = {
-	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
-	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
-	0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF,
-	0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF,
-	0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
-	0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
-	0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
-	0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFE,
-	0x7F, 0x7F, 0x7E, 0x7D, 0x7C, 0x7B, 0x7A, 0x79, 0x78, 0x77, 0x76, 0x75, 0x74, 0x73, 0x72, 0x71,
-	0x70, 0x6F, 0x6E, 0x6D, 0x6C, 0x6B, 0x6A, 0x69, 0x68, 0x67, 0x66, 0x65, 0x64, 0x63, 0x62, 0x61,
-	0x60, 0x5F, 0x5E, 0x5D, 0x5C, 0x5B, 0x5A, 0x59, 0x58, 0x57, 0x56, 0x55, 0x54, 0x53, 0x52, 0x51,
-	0x50, 0x4F, 0x4E, 0x4D, 0x4C, 0x4B, 0x4A, 0x49, 0x48, 0x47, 0x46, 0x45, 0x44, 0x43, 0x42, 0x41,
-	0x40, 0x3F, 0x3E, 0x3D, 0x3C, 0x3B, 0x3A, 0x39, 0x38, 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31,
-	0x30, 0x2F, 0x2E, 0x2D, 0x2C, 0x2B, 0x2A, 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21,
-	0x20, 0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18, 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11,
-	0x10, 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01
-};
-
 //	KYRA 2
 
 SoundTowns_v2::SoundTowns_v2(KyraEngine *vm, Audio::Mixer *mixer)
@@ -1413,12 +1395,12 @@ void SoundTowns_v2::playTrack(uint8 track) {
 	if (track == _lastTrack && _musicEnabled)
 		return;
 
-	const uint8 * const cdaTracks = (const uint8 * const) cdaData();
+	const uint16 * const cdaTracks = (const uint16 * const) cdaData();
 
 	int trackNum = -1;
-	for (uint32 i = 0; i < cdaTrackNum(); i++) {
-		if (track == cdaTracks[i * 2]) {
-			trackNum = cdaTracks[i * 2 + 1] - 1;
+	for (int i = 0; i < cdaTrackNum(); i++) {
+		if (track == (uint8) READ_LE_UINT16(&cdaTracks[i * 2])) {
+			trackNum = (int) READ_LE_UINT16(&cdaTracks[i * 2 + 1]) - 1;
 			break;
 		}
 	}