[Scummvm-cvs-logs] SF.net SVN: scummvm: [21660] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 21660
Author:   kirben
Date:     2006-04-06 20:30:52 -0700 (Thu, 06 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21660&view=rev

Log Message:
-----------
Sprite is always set to 1 in o_printStr() and o1_scnTxtLongText() for FF. Fixes wait timeouts in holomail.

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
    scummvm/trunk/engines/simon/simon.cpp
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-07 03:03:20 UTC (rev 21659)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-07 03:30:52 UTC (rev 21660)
@@ -1246,12 +1246,16 @@
 	uint color = getVarOrByte();
 	uint stringId = getVarOrByte();
 	uint speechId = 0;
+	TextLocation *tl;
 
 	const char *string_ptr = (const char *)getStringPtrByID(_stringIdArray3[stringId]);
-	TextLocation *tl = getTextLocation(vgaSpriteId);
 	if (getFeatures() & GF_TALKIE)
 		speechId = _speechIdArray4[stringId];
 
+	if (getGameType() == GType_FF)
+		vgaSpriteId = 1;
+	tl = getTextLocation(vgaSpriteId);
+
 	if (_speech && speechId != 0)
 		playSpeech(speechId, vgaSpriteId);
 	if (string_ptr != NULL && _subtitles)

Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-07 03:03:20 UTC (rev 21659)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-07 03:30:52 UTC (rev 21660)
@@ -2143,10 +2143,9 @@
 		speech_id = (uint16)getNextWord();
 
 	if (getGameType() == GType_FF)
-		tl = getTextLocation(1);
-	else
-		tl = getTextLocation(vgaSpriteId);
+		vgaSpriteId = 1;
 
+	tl = getTextLocation(vgaSpriteId);
 	if (_speech && speech_id != 0)
 		playSpeech(speech_id, vgaSpriteId);
 	if ((getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE) && speech_id == 0)


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