[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.96,1.97

[kirben]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20293/simon

Modified Files:
	sound.cpp 
Log Message:

Speech support for FF.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- sound.cpp	15 Nov 2005 04:54:18 -0000	1.96
+++ sound.cpp	15 Nov 2005 12:03:38 -0000	1.97
@@ -82,6 +82,10 @@
 	else
 		size = _file->readUint32LE();
 
+	// The Feeble Files uses set amount of voice offsets
+	if (size == 0)
+		size = 40000;
+
 	res = size / sizeof(uint32);
 
 	_offsets = (uint32 *)malloc(size + sizeof(uint32));
@@ -447,7 +451,11 @@
 		return;
 
 	_mixer->stopHandle(_voiceHandle);
-	_voice->playSound(sound, &_voiceHandle, (_vm->getGameId() == GID_SIMON1CD32) ? 0 : Audio::Mixer::FLAG_UNSIGNED);
+	if (_vm->getGameType() == GType_FF || _vm->getGameId() == GID_SIMON1CD32) {
+		_voice->playSound(sound, &_voiceHandle, 0);
+	} else {
+		_voice->playSound(sound, &_voiceHandle, Audio::Mixer::FLAG_UNSIGNED);
+	}
 }
 
 void Sound::playSoundData(byte *soundData, uint sound, uint pan, uint vol, bool ambient) {