[Scummvm-cvs-logs] SF.net SVN: scummvm: [22699] scummvm/trunk/engines/kyra/gui.cpp
vinterstum at users.sourceforge.net
vinterstum at users.sourceforge.net
Sat May 27 22:10:06 CEST 2006
Revision: 22699
Author: vinterstum
Date: 2006-05-27 22:09:09 -0700 (Sat, 27 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22699&view=rev
Log Message:
-----------
Added checks for sound/text config in Brandons responses to using the amulet
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui.cpp
Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp 2006-05-28 04:53:22 UTC (rev 22698)
+++ scummvm/trunk/engines/kyra/gui.cpp 2006-05-28 05:09:09 UTC (rev 22699)
@@ -111,31 +111,34 @@
return 1;
if (_itemInHand != -1) {
assert(_putDownFirst);
- if (_features & GF_TALKIE) {
+ if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish();
snd_playVoiceFile(2000);
}
- characterSays(_putDownFirst[0], 0, -2);
+ if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
+ characterSays(_putDownFirst[0], 0, -2);
return 1;
}
if (queryGameFlag(0xF1)) {
assert(_waitForAmulet);
- if (_features & GF_TALKIE) {
+ if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish();
snd_playVoiceFile(2001);
}
- characterSays(_waitForAmulet[0], 0, -2);
+ if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
+ characterSays(_waitForAmulet[0], 0, -2);
return 1;
}
if (!queryGameFlag(0x55+jewel)) {
assert(_blackJewel);
_animator->makeBrandonFaceMouse();
drawJewelPress(jewel, 1);
- if (_features & GF_TALKIE) {
+ if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish();
snd_playVoiceFile(2002);
}
- characterSays(_blackJewel[0], 0, -2);
+ if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
+ characterSays(_blackJewel[0], 0, -2);
return 1;
}
drawJewelPress(jewel, 0);
@@ -162,11 +165,12 @@
} else if (_brandonStatusBit == 0) {
seq_brandonHealing();
assert(_healingTip);
- if (_features & GF_TALKIE) {
+ if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish();
snd_playVoiceFile(2003);
}
- characterSays(_healingTip[0], 0, -2);
+ if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
+ characterSays(_healingTip[0], 0, -2);
}
break;
@@ -177,11 +181,12 @@
case 2:
if (_brandonStatusBit & 1) {
assert(_wispJewelStrings);
- if (_features & GF_TALKIE) {
+ if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish();
snd_playVoiceFile(2004);
}
- characterSays(_wispJewelStrings[0], 0, -2);
+ if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
+ characterSays(_wispJewelStrings[0], 0, -2);
} else {
if (_brandonStatusBit & 2) {
// XXX
@@ -205,11 +210,12 @@
case 3:
seq_dispelMagicAnimation();
assert(_magicJewelString);
- if (_features & GF_TALKIE) {
+ if (_features & GF_TALKIE && (_configVoice == 1 || _configVoice == 2)) {
snd_voiceWaitForFinish();
snd_playVoiceFile(2007);
}
- characterSays(_magicJewelString[0], 0, -2);
+ if (_features & GF_FLOPPY || (_configVoice == 0 || _configVoice == 2))
+ characterSays(_magicJewelString[0], 0, -2);
break;
default:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list