thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r41350
This commit is contained in:
Johannes Schickel 2009-06-07 19:58:00 +00:00
parent a6ed05740f
commit c7861cb65e
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/kyra/script_lol.cpp
View file

@ -1417,7 +1417,7 @@ int LoLEngine::olol_playEndSequence(EMCState *script){
_screen->hideMouse(); _screen->hideMouse();
memset(_screen->getPalette(1), 0, 768); memset(_screen->getPalette(1), 0, 768);
showOutro(c, _monsterDifficulty == 2 ? true : false); showOutro(c, (_monsterDifficulty == 2));
quitGame(); quitGame();
return 0; return 0;

7
engines/kyra/sound_lol.cpp
View file

@ -186,12 +186,13 @@ void LoLEngine::snd_playSoundEffect(int track, int volume) {
} }
if (hasVocFile) { 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) { } else if (_flags.platform == Common::kPlatformPC) {
if (_sound->getSfxType() == Sound::kMidiMT32) 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) else if (_sound->getSfxType() == Sound::kMidiGM)
track = track < _ingameGMSoundIndexSize ? _ingameGMSoundIndex[track] - 1: -1; track = (track < _ingameGMSoundIndexSize) ? (_ingameGMSoundIndex[track] - 1) : -1;
if (track == 168) if (track == 168)
track = 167; track = 167;