From dea50612cb25d9017ed00ea99a71ad4badb4cc13 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 21 Mar 2008 16:54:08 +0000
Subject: - disabled some old warnings - removed waiting for voice to finish in
 o1_restoreCustomPrintBackground

svn-id: r31211
---
 engines/kyra/script_v1.cpp | 3 +--
 engines/kyra/text_v1.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp
index eabfb755ac..768848c616 100644
--- a/engines/kyra/script_v1.cpp
+++ b/engines/kyra/script_v1.cpp
@@ -646,6 +646,7 @@ int KyraEngine_v1::o1_customPrintTalkString(ScriptState *script) {
 			snd_voiceWaitForFinish();
 			snd_playVoiceFile(stackPos(0));
 		}
+
 		_skipFlag = false;
 		if (textEnabled())
 			_text->printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2);
@@ -660,8 +661,6 @@ int KyraEngine_v1::o1_customPrintTalkString(ScriptState *script) {
 
 int KyraEngine_v1::o1_restoreCustomPrintBackground(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_restoreCustomPrintBackground(%p) ()", (const void *)script);
-	snd_voiceWaitForFinish();
-	snd_stopVoice();
 	_text->restoreTalkTextMessageBkgd(2, 0);
 	return 0;
 }
diff --git a/engines/kyra/text_v1.cpp b/engines/kyra/text_v1.cpp
index 7f49c04766..0c71b143cc 100644
--- a/engines/kyra/text_v1.cpp
+++ b/engines/kyra/text_v1.cpp
@@ -159,7 +159,7 @@ void KyraEngine_v1::endCharacterChat(int8 charNum, int16 convoInitialized) {
 
 	if (charNum > 4 && charNum < 11) {
 		//TODO: weird _game_inventory stuff here
-		warning("STUB: endCharacterChat() for high charnums");
+		//warning("STUB: endCharacterChat() for high charnums");
 	}
 
 	if (convoInitialized != 0) {
@@ -247,7 +247,7 @@ int KyraEngine_v1::initCharacterChat(int8 charNum) {
 
 	if (charNum > 4 && charNum < 11) {
 		// TODO: Fill in weird _game_inventory stuff here
-		warning("STUB: initCharacterChat() for high charnums");
+		//warning("STUB: initCharacterChat() for high charnums");
 	}
 
 	_animator->flagAllObjectsForRefresh();
-- 
cgit v1.2.3