Merged revisions 33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33769

7 files changed, 118 insertions, 74 deletions

diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 0c9b117866..0722fb262b 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -196,14 +196,18 @@ void KyraEngine_HoF::pauseEngineIntern(bool pause) {
 		_seqWsaChatTimeout += pausedTime;
 		_seqWsaChatFrameTimeout += pausedTime;
 
-		for (int x = 0; x < 10; x++) {
-			if (_activeText[x].duration != -1)
-				_activeText[x].startTime += pausedTime;
+		if (_activeText) {
+			for (int x = 0; x < 10; x++) {
+				if (_activeText[x].duration != -1)
+					_activeText[x].startTime += pausedTime;
+			}
 		}
 
-		for (int x = 0; x < 8; x++) {
-			if (_activeWSA[x].flags != -1)
-				_activeWSA[x].nextFrame += pausedTime;
+		if (_activeWSA) {
+			for (int x = 0; x < 8; x++) {
+				if (_activeWSA[x].flags != -1)
+					_activeWSA[x].nextFrame += pausedTime;
+			}
 		}
 
 		_nextIdleAnim += pausedTime;
@@ -1505,15 +1509,19 @@ void KyraEngine_HoF::openTalkFile(int newFile) {
 		_oldTalkFile = -1;
 	}
 
-	if (newFile == 0) {
+	if (newFile == 0)
 		strcpy(talkFilename, "ANYTALK.TLK");
-		_res->loadPakFile(talkFilename);
-	} else {
+	else
 		sprintf(talkFilename, "CH%dVOC.TLK", newFile);
-		_res->loadPakFile(talkFilename);
-	}
 
 	_oldTalkFile = newFile;
+
+	if (!_res->loadPakFile(talkFilename)) {
+		if (speechEnabled()) {
+			warning("Couldn't load file '%s' falling back to text only mode", talkFilename);
+			_configVoice = 0;
+		}
+	}
 }
 
 void KyraEngine_HoF::snd_playVoiceFile(int id) {
@@ -1549,7 +1557,8 @@ void KyraEngine_HoF::playVoice(int high, int low) {
 	if (!_flags.isTalkie)
 		return;
 	int vocFile = high * 10000 + low * 10;
-	snd_playVoiceFile(vocFile);
+	if (speechEnabled())
+		snd_playVoiceFile(vocFile);
 }
 
 void KyraEngine_HoF::snd_playSoundEffect(int track, int volume) {
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index 279e9e35a6..f6e887c648 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -302,8 +302,7 @@ protected:
 	static const int8 _dosTrackMap[];
 	static const int _dosTrackMapSize;
 
-	const AudioDataStruct *_soundData;
-
+	AudioDataStruct _soundData[3];
 protected:
 	// game initialization
 	void startup();
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index f668ae8401..afd164958c 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -173,8 +173,7 @@ int KyraEngine_LoK::init() {
 
 	initStaticResource();
 
-	if (_soundData)
-		_sound->setSoundList(&_soundData[kMusicIntro]);
+	_sound->setSoundList(&_soundData[kMusicIntro]);
 
 	_trackMap = _dosTrackMap;
 	_trackMapSize = _dosTrackMapSize;
@@ -317,8 +316,7 @@ void KyraEngine_LoK::startup() {
 	debugC(9, kDebugLevelMain, "KyraEngine_LoK::startup()");
 	static const uint8 colorMap[] = { 0, 0, 0, 0, 12, 12, 12, 0, 0, 0, 0, 0 };
 	_screen->setTextColorMap(colorMap);
-	if (_soundData)
-		_sound->setSoundList(&_soundData[kMusicIngame]);
+	_sound->setSoundList(&_soundData[kMusicIngame]);
 	_sound->loadSoundFile(0);
 //	_screen->setFont(Screen::FID_6_FNT);
 	_screen->setAnimBlockPtr(3750);
diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h
index cb3062847e..1def95ddbf 100644
--- a/engines/kyra/kyra_lok.h
+++ b/engines/kyra/kyra_lok.h
@@ -633,7 +633,7 @@ protected:
 	int _soundFilesIntroSize;
 	const int32 *_cdaTrackTable;
 	int _cdaTrackTableSize;
-	const AudioDataStruct * _soundData;
+	AudioDataStruct _soundData[3];
 
 	// positions of the inventory
 	static const uint16 _itemPosX[];
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 7097543750..45a277c400 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -508,7 +508,8 @@ void KyraEngine_MR::snd_playVoiceFile(int file) {
 	char filename[16];
 	snprintf(filename, 16, "%.08u", (uint)file);
 
-	_voiceSoundChannel = _soundDigital->playSound(filename, 0xFE, Audio::Mixer::kSpeechSoundType, 255);
+	if (speechEnabled())
+		_voiceSoundChannel = _soundDigital->playSound(filename, 0xFE, Audio::Mixer::kSpeechSoundType, 255);
 }
 
 bool KyraEngine_MR::snd_voiceIsPlaying() {
@@ -802,7 +803,12 @@ void KyraEngine_MR::openTalkFile(int file) {
 	}
 
 	_currentTalkFile = file;
-	_res->loadPakFile(talkFilename);
+	if (!_res->loadPakFile(talkFilename)) {
+		if (speechEnabled()) {
+			warning("Couldn't load file '%s' falling back to text only mode", talkFilename);
+			_configVoice = 0;
+		}
+	}
 }
 
 #pragma mark -
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 6d61bd997f..f4f845c5f7 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -70,9 +70,9 @@ enum {
 
 struct AudioDataStruct {
 	const char * const *_fileList;
-	const int _fileListLen;
-	const void * const _cdaTracks;
-	const int _cdaNumTracks;
+	int _fileListLen;
+	const void * _cdaTracks;
+	int _cdaNumTracks;
 };
 
 // TODO: this is just the start of makeing the debug output of the kyra engine a bit more useable
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 7d7f0cd4b8..bb63c24c36 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -1055,32 +1055,48 @@ void KyraEngine_LoK::initStaticResource() {
 	static const char *tIntro98[] = { "intro%d.dat" };
 	static const char *tIngame98[] = { "kyram%d.dat" };
 
-	static const AudioDataStruct soundData_PC[] = {
-		{ _soundFilesIntro, _soundFilesIntroSize, 0, 0 },
-		{ _soundFiles, _soundFilesSize, 0, 0 },
-		{ 0, 0, 0, 0}
-	};
-
-	static const AudioDataStruct soundData_TOWNS[] = {
-		{ _soundFiles, _soundFilesSize, _cdaTrackTable, _cdaTrackTableSize },
-		{ _soundFiles, _soundFilesSize, _cdaTrackTable, _cdaTrackTableSize },
-		{ 0, 0, 0, 0}
-	};
-
-	static const AudioDataStruct soundData_PC98[] = {
-		{ tIntro98, 1, 0, 0 },
-		{ tIngame98, 1, 0, 0 },
-		{ 0, 0, 0, 0}
-	};
-
-	if (_flags.platform == Common::kPlatformPC)
-		_soundData = soundData_PC;
-	else if (_flags.platform == Common::kPlatformFMTowns)
-		_soundData = soundData_TOWNS;
-	else if (_flags.platform == Common::kPlatformPC98)
-		_soundData = soundData_PC98;
-	else
-		_soundData = 0;
+	if (_flags.platform == Common::kPlatformPC) {
+		_soundData[0]._fileList = _soundFilesIntro;
+		_soundData[0]._fileListLen = _soundFilesIntroSize;
+		_soundData[0]._cdaTracks = 0;
+		_soundData[0]._cdaNumTracks = 0;
+		_soundData[1]._fileList = _soundFiles;
+		_soundData[1]._fileListLen = _soundFilesSize;
+		_soundData[1]._cdaTracks = 0;
+		_soundData[1]._cdaNumTracks = 0;
+		_soundData[2]._fileList = 0;
+		_soundData[2]._fileListLen = 0;
+		_soundData[2]._cdaTracks = 0;
+		_soundData[2]._cdaNumTracks = 0;
+	} else if (_flags.platform == Common::kPlatformFMTowns) {
+		_soundData[0]._fileList = _soundFiles;
+		_soundData[0]._fileListLen = _soundFilesSize;
+		_soundData[0]._cdaTracks = _cdaTrackTable;
+		_soundData[0]._cdaNumTracks = _cdaTrackTableSize;
+		_soundData[1]._fileList = _soundFiles;
+		_soundData[1]._fileListLen = _soundFilesSize;
+		_soundData[1]._cdaTracks = _cdaTrackTable;
+		_soundData[1]._cdaNumTracks = _cdaTrackTableSize;
+		_soundData[2]._fileList = 0;
+		_soundData[2]._fileListLen = 0;
+		_soundData[2]._cdaTracks = 0;
+		_soundData[2]._cdaNumTracks = 0;
+	} else if (_flags.platform == Common::kPlatformPC98) {
+		_soundData[0]._fileList = tIntro98;
+		_soundData[0]._fileListLen = 1;
+		_soundData[0]._cdaTracks = 0;
+		_soundData[0]._cdaNumTracks = 0;
+		_soundData[1]._fileList = tIngame98;
+		_soundData[1]._fileListLen = 1;
+		_soundData[1]._cdaTracks = 0;
+		_soundData[1]._cdaNumTracks = 0;
+		_soundData[2]._fileList = 0;
+		_soundData[2]._fileListLen = 0;
+		_soundData[2]._cdaTracks = 0;
+		_soundData[2]._cdaNumTracks = 0;
+	} else {
+		memset(_soundData, 0, sizeof(_soundData));
+	}
 }
 
 void KyraEngine_LoK::loadMouseShapes() {
@@ -1282,30 +1298,46 @@ void KyraEngine_HoF::initStaticResource() {
 	static const char *pc98MusicFileListFinale[] = { "finale%d.86" };
 	static const char *pc98MusicFileListIngame[] = { "km%02d.86" };
 
-	static const AudioDataStruct soundData_PC[] = {
-		{ _musicFileListIntro, _musicFileListIntroSize, 0, 0 },
-		{ _musicFileListIngame, _musicFileListIngameSize, 0, 0},
-		{ _musicFileListFinale, _musicFileListIntroSize, 0, 0 }
-	};
-
-	static const AudioDataStruct soundData_TOWNS[] = {
-		{ fmtMusicFileListIntro, 1, _cdaTrackTableIntro, _cdaTrackTableIntroSize >> 1 },
-		{ fmtMusicFileListIngame, 1, _cdaTrackTableIngame, _cdaTrackTableIngameSize >> 1 },
-		{ fmtMusicFileListFinale, 1, _cdaTrackTableFinale, _cdaTrackTableFinaleSize >> 1 }
-	};
-
-	static const AudioDataStruct soundData_PC98[] = {
-		{ pc98MusicFileListIntro, 1, 0, 0 },
-		{ pc98MusicFileListIngame, 1, 0, 0 },
-		{ pc98MusicFileListFinale, 1, 0, 0 }		
-	};
-
-	if (_flags.platform == Common::kPlatformPC)
-		_soundData = soundData_PC;
-	else if (_flags.platform == Common::kPlatformFMTowns)
-		_soundData = soundData_TOWNS;
-	else if (_flags.platform == Common::kPlatformPC98)
-		_soundData = soundData_PC98;
+	if (_flags.platform == Common::kPlatformPC) {
+		_soundData[0]._fileList = _musicFileListIntro;
+		_soundData[0]._fileListLen = _musicFileListIntroSize;
+		_soundData[0]._cdaTracks = 0;
+		_soundData[0]._cdaNumTracks = 0;
+		_soundData[1]._fileList = _musicFileListIngame;
+		_soundData[1]._fileListLen = _musicFileListIngameSize;
+		_soundData[1]._cdaTracks = 0;
+		_soundData[1]._cdaNumTracks = 0;
+		_soundData[2]._fileList = _musicFileListFinale;
+		_soundData[2]._fileListLen = _musicFileListIntroSize;
+		_soundData[2]._cdaTracks = 0;
+		_soundData[2]._cdaNumTracks = 0;
+	} else if (_flags.platform == Common::kPlatformFMTowns) {
+		_soundData[0]._fileList = fmtMusicFileListIntro;
+		_soundData[0]._fileListLen = 1;
+		_soundData[0]._cdaTracks = _cdaTrackTableIntro;
+		_soundData[0]._cdaNumTracks = _cdaTrackTableIntroSize >> 1;
+		_soundData[1]._fileList = fmtMusicFileListIngame;
+		_soundData[1]._fileListLen = 1;
+		_soundData[1]._cdaTracks = _cdaTrackTableIngame;
+		_soundData[1]._cdaNumTracks = _cdaTrackTableIngameSize >> 1;
+		_soundData[2]._fileList = fmtMusicFileListFinale;
+		_soundData[2]._fileListLen = 1;
+		_soundData[2]._cdaTracks = _cdaTrackTableFinale;
+		_soundData[2]._cdaNumTracks = _cdaTrackTableFinaleSize >> 1;
+	} else if (_flags.platform == Common::kPlatformPC98) {
+		_soundData[0]._fileList = pc98MusicFileListIntro;
+		_soundData[0]._fileListLen = 1;
+		_soundData[0]._cdaTracks = 0;
+		_soundData[0]._cdaNumTracks = 0;
+		_soundData[1]._fileList = pc98MusicFileListIngame;
+		_soundData[1]._fileListLen = 1;
+		_soundData[1]._cdaTracks = 0;
+		_soundData[1]._cdaNumTracks = 0;
+		_soundData[2]._fileList = pc98MusicFileListFinale;
+		_soundData[2]._fileListLen = 1;
+		_soundData[2]._cdaTracks = 0;
+		_soundData[2]._cdaNumTracks = 0;
+	}
 
 	// setup sequence data
 	_sequences = _staticres->loadHofSequenceData(k2SeqplaySeqData, tmpSize);