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

[lordhoto at users.sourceforge.net]

Revision: 41957
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41957&view=rev
Author:   lordhoto
Date:     2009-06-29 17:26:43 +0000 (Mon, 29 Jun 2009)

Log Message:
-----------
Resolved some TODOs in Kyra3 code.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_mr.cpp
    scummvm/trunk/engines/kyra/scene_mr.cpp

Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp	2009-06-29 17:06:17 UTC (rev 41956)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp	2009-06-29 17:26:43 UTC (rev 41957)
@@ -269,7 +269,6 @@
 
 		_screen->setScreenPalette(_screen->getPalette(0));
 
-		// XXX
 		playMenuAudioFile();
 
 		for (int i = 0; i < 64 && !shouldQuit(); ++i) {
@@ -558,9 +557,7 @@
 	_screen->setFont(Screen::FID_6_FNT);
 
 	_stringBuffer = new char[500];
-	//XXX
 	musicUpdate(0);
-	//XXX
 	allocAnimObjects(1, 16, 50);
 
 	musicUpdate(0);
@@ -585,13 +582,10 @@
 		error("couldn't load _ACTOR");
 
 	musicUpdate(0);
-	//XXX
-	musicUpdate(0);
 	openTalkFile(0);
 	musicUpdate(0);
 	_currentTalkFile = 0;
 	openTalkFile(1);
-	//XXX
 	loadCostPal();
 	musicUpdate(0);
 

Modified: scummvm/trunk/engines/kyra/scene_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_mr.cpp	2009-06-29 17:06:17 UTC (rev 41956)
+++ scummvm/trunk/engines/kyra/scene_mr.cpp	2009-06-29 17:26:43 UTC (rev 41957)
@@ -48,10 +48,8 @@
 	}
 	musicUpdate(0);
 
-	if (!unk3) {
-		//XXX
+	if (!unk3)
 		musicUpdate(0);
-	}
 
 	if (unk1) {
 		int x = _mainCharacter.x1;
@@ -88,7 +86,7 @@
 		newSoundFile = true;
 	}
 
-	//XXX
+	_chatAltFlag = false;
 
 	if (!unk3) {
 		_emc->init(&_sceneScriptState, &_sceneScriptData);


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