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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri Mar 21 17:54:09 CET 2008


Revision: 31211
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31211&view=rev
Author:   lordhoto
Date:     2008-03-21 09:54:08 -0700 (Fri, 21 Mar 2008)

Log Message:
-----------
- disabled some old warnings
- removed waiting for voice to finish in o1_restoreCustomPrintBackground

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_v1.cpp
    scummvm/trunk/engines/kyra/text_v1.cpp

Modified: scummvm/trunk/engines/kyra/script_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v1.cpp	2008-03-21 16:21:27 UTC (rev 31210)
+++ scummvm/trunk/engines/kyra/script_v1.cpp	2008-03-21 16:54:08 UTC (rev 31211)
@@ -646,6 +646,7 @@
 			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_restoreCustomPrintBackground(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_restoreCustomPrintBackground(%p) ()", (const void *)script);
-	snd_voiceWaitForFinish();
-	snd_stopVoice();
 	_text->restoreTalkTextMessageBkgd(2, 0);
 	return 0;
 }

Modified: scummvm/trunk/engines/kyra/text_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_v1.cpp	2008-03-21 16:21:27 UTC (rev 31210)
+++ scummvm/trunk/engines/kyra/text_v1.cpp	2008-03-21 16:54:08 UTC (rev 31211)
@@ -159,7 +159,7 @@
 
 	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 @@
 
 	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();


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