aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Kagerer2010-09-07 18:50:48 +0000
committerFlorian Kagerer2010-09-07 18:50:48 +0000
commit8448c50c712604d172e66ae2a1c42ca7d8bd3389 (patch)
tree3e43d6bba3f323ec5bc3a2372b9f3b4f26a7541b
parent009889dd13c9a9ddb535864ef75a19a886dc7d28 (diff)
downloadscummvm-rg350-8448c50c712604d172e66ae2a1c42ca7d8bd3389.tar.gz
scummvm-rg350-8448c50c712604d172e66ae2a1c42ca7d8bd3389.tar.bz2
scummvm-rg350-8448c50c712604d172e66ae2a1c42ca7d8bd3389.zip
LOL FLOPPY: silence pointless warnings in character selection
svn-id: r52627
-rw-r--r--engines/kyra/sequences_lol.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index dc1a0f4d15..6f0afea033 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -397,7 +397,8 @@ void LoLEngine::kingSelectionIntro() {
_screen->fprintStringIntro("%s", 8, y + i * 10, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(57 + i));
}
- _sound->voicePlay("KING01", &_speechHandle);
+ if (_flags.isTalkie)
+ _sound->voicePlay("KING01", &_speechHandle);
int index = 4;
while ((!speechEnabled() || (speechEnabled() && _sound->voiceIsPlaying(&_speechHandle))) && _charSelection == -1 && !shouldQuit() && !skipFlag()) {
@@ -441,7 +442,8 @@ void LoLEngine::kingSelectionReminder() {
_screen->fprintStringIntro("%s", 8, y + 10, 0x32, 0x00, 0x9C, 0x20, _tim->getCTableEntry(63));
}
- _sound->voicePlay("KING02", &_speechHandle);
+ if (_flags.isTalkie)
+ _sound->voicePlay("KING02", &_speechHandle);
int index = 0;
while ((!speechEnabled() || (speechEnabled() && _sound->voiceIsPlaying(&_speechHandle))) && _charSelection == -1 && !shouldQuit() && index < 15) {
@@ -468,7 +470,8 @@ void LoLEngine::kingSelectionReminder() {
}
void LoLEngine::kingSelectionOutro() {
- _sound->voicePlay("KING03", &_speechHandle);
+ if (_flags.isTalkie)
+ _sound->voicePlay("KING03", &_speechHandle);
int index = 0;
while ((!speechEnabled() || (speechEnabled() && _sound->voiceIsPlaying(&_speechHandle))) && !shouldQuit() && !skipFlag()) {
@@ -627,7 +630,8 @@ void LoLEngine::selectionCharInfoIntro(char *file) {
if (speechEnabled() && !_sound->isVoicePresent(file))
break;
- _sound->voicePlay(file, &_speechHandle);
+ if (_flags.isTalkie)
+ _sound->voicePlay(file, &_speechHandle);
int i = 0;
while ((!speechEnabled() || (speechEnabled() && _sound->voiceIsPlaying(&_speechHandle))) && _charSelectionInfoResult == -1 && !shouldQuit()) {