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

[athrxx at users.sourceforge.net]

Revision: 52627
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52627&view=rev
Author:   athrxx
Date:     2010-09-07 18:50:48 +0000 (Tue, 07 Sep 2010)

Log Message:
-----------
LOL FLOPPY: silence pointless warnings in character selection

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sequences_lol.cpp

Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp	2010-09-07 17:58:10 UTC (rev 52626)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp	2010-09-07 18:50:48 UTC (rev 52627)
@@ -397,7 +397,8 @@
 			_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 @@
 		_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::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 @@
 		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()) {


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