[Scummvm-cvs-logs] SF.net SVN: scummvm:[41350] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 41350
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41350&view=rev
Author:   lordhoto
Date:     2009-06-07 19:58:00 +0000 (Sun, 07 Jun 2009)

Log Message:
-----------
Avoid warning about missing SFX file in Lands of Lore (it seems the original misses some datafiles for certain effects).

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_lol.cpp
    scummvm/trunk/engines/kyra/sound_lol.cpp

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2009-06-07 19:15:55 UTC (rev 41349)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2009-06-07 19:58:00 UTC (rev 41350)
@@ -1417,7 +1417,7 @@
 	_screen->hideMouse();
 	memset(_screen->getPalette(1), 0, 768);
 	
-	showOutro(c, _monsterDifficulty == 2 ? true : false);
+	showOutro(c, (_monsterDifficulty == 2));
 	quitGame();
 
 	return 0;

Modified: scummvm/trunk/engines/kyra/sound_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_lol.cpp	2009-06-07 19:15:55 UTC (rev 41349)
+++ scummvm/trunk/engines/kyra/sound_lol.cpp	2009-06-07 19:58:00 UTC (rev 41350)
@@ -186,12 +186,13 @@
 	}
 
 	if (hasVocFile) {
-		_sound->voicePlay(_ingameSoundList[vocIndex], 0, volume & 0xff, true);
+		if (_sound->isVoicePresent(_ingameSoundList[vocIndex]))
+			_sound->voicePlay(_ingameSoundList[vocIndex], 0, volume & 0xff, true);
 	} else if (_flags.platform == Common::kPlatformPC) {
 		if (_sound->getSfxType() == Sound::kMidiMT32)
-			track = track < _ingameMT32SoundIndexSize ? _ingameMT32SoundIndex[track] - 1 : -1;
+			track = (track < _ingameMT32SoundIndexSize) ? (_ingameMT32SoundIndex[track] - 1) : -1;
 		else if (_sound->getSfxType() == Sound::kMidiGM)
-			track = track < _ingameGMSoundIndexSize ? _ingameGMSoundIndex[track] - 1: -1;
+			track = (track < _ingameGMSoundIndexSize) ? (_ingameGMSoundIndex[track] - 1) : -1;
 
 		if (track == 168)
 			track = 167;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.