libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added checks for sound/text config in Brandons responses to using the amulet

Browse Source 
svn-id: r22699
This commit is contained in:
Oystein Eftevaag 2006-05-28 05:09:09 +00:00
parent 8161aa8adb
commit 3a1dec3ad1
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
engines/kyra/gui.cpp
View File

@ -111,31 +111,34 @@ int KyraEngine::buttonAmuletCallback(Button *caller) {
return 1; return 1;
if (_itemInHand != -1) { if (_itemInHand != -1) {
assert(_putDownFirst); assert(_putDownFirst);
if (_features & GF_TALKIE) { if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish(); snd_voiceWaitForFinish();
snd_playVoiceFile(2000); snd_playVoiceFile(2000);
} }
characterSays(_putDownFirst[0], 0, -2); if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
characterSays(_putDownFirst[0], 0, -2);
return 1; return 1;
} }
if (queryGameFlag(0xF1)) { if (queryGameFlag(0xF1)) {
assert(_waitForAmulet); assert(_waitForAmulet);
if (_features & GF_TALKIE) { if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish(); snd_voiceWaitForFinish();
snd_playVoiceFile(2001); snd_playVoiceFile(2001);
} }
characterSays(_waitForAmulet[0], 0, -2); if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
characterSays(_waitForAmulet[0], 0, -2);
return 1; return 1;
} }
if (!queryGameFlag(0x55+jewel)) { if (!queryGameFlag(0x55+jewel)) {
assert(_blackJewel); assert(_blackJewel);
_animator->makeBrandonFaceMouse(); _animator->makeBrandonFaceMouse();
drawJewelPress(jewel, 1); drawJewelPress(jewel, 1);
if (_features & GF_TALKIE) { if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish(); snd_voiceWaitForFinish();
snd_playVoiceFile(2002); snd_playVoiceFile(2002);
} }
characterSays(_blackJewel[0], 0, -2); if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
characterSays(_blackJewel[0], 0, -2);
return 1; return 1;
} }
drawJewelPress(jewel, 0); drawJewelPress(jewel, 0);
@ -162,11 +165,12 @@ int KyraEngine::buttonAmuletCallback(Button *caller) {
} else if (_brandonStatusBit == 0) { } else if (_brandonStatusBit == 0) {
seq_brandonHealing(); seq_brandonHealing();
assert(_healingTip); assert(_healingTip);
if (_features & GF_TALKIE) { if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish(); snd_voiceWaitForFinish();
snd_playVoiceFile(2003); snd_playVoiceFile(2003);
} }
characterSays(_healingTip[0], 0, -2); if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
characterSays(_healingTip[0], 0, -2);
} }
break; break;
@ -177,11 +181,12 @@ int KyraEngine::buttonAmuletCallback(Button *caller) {
case 2: case 2:
if (_brandonStatusBit & 1) { if (_brandonStatusBit & 1) {
assert(_wispJewelStrings); assert(_wispJewelStrings);
if (_features & GF_TALKIE) { if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish(); snd_voiceWaitForFinish();
snd_playVoiceFile(2004); snd_playVoiceFile(2004);
} }
characterSays(_wispJewelStrings[0], 0, -2); if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
characterSays(_wispJewelStrings[0], 0, -2);
} else { } else {
if (_brandonStatusBit & 2) { if (_brandonStatusBit & 2) {
// XXX // XXX
@ -205,11 +210,12 @@ int KyraEngine::buttonAmuletCallback(Button *caller) {
case 3: case 3:
seq_dispelMagicAnimation(); seq_dispelMagicAnimation();
assert(_magicJewelString); assert(_magicJewelString);
if (_features & GF_TALKIE) { if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish(); snd_voiceWaitForFinish();
snd_playVoiceFile(2007); snd_playVoiceFile(2007);
} }
characterSays(_magicJewelString[0], 0, -2); if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
characterSays(_magicJewelString[0], 0, -2);
break; break;
default: default: