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

[kirben at users.sourceforge.net]

Revision: 21927
Author:   kirben
Date:     2006-04-15 16:23:55 -0700 (Sat, 15 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21927&view=rev

Log Message:
-----------
Fix speech id for o_screenTextMsg() in FF

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-15 22:37:48 UTC (rev 21926)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-15 23:23:55 UTC (rev 21927)
@@ -1285,25 +1285,29 @@
 	uint color = getVarOrByte();
 	uint stringId = getNextStringID();
 	const byte *string_ptr = NULL;
-	uint speech_id = 0;
+	uint speechId = 0;
 	TextLocation *tl;
 
 	if (stringId != 0xFFFF)
 		string_ptr = getStringPtrByID(stringId);
 
-	if (getFeatures() & GF_TALKIE)
-		speech_id = (uint16)getNextWord();
+	if (getFeatures() & GF_TALKIE) {
+		if (getGameType() == GType_FF)
+			speechId = (uint16)getVarOrWord();
+		else
+			speechId = (uint16)getNextWord();
+	}
 
 	if (getGameType() == GType_FF)
 		vgaSpriteId = 1;
 
 	tl = getTextLocation(vgaSpriteId);
-	if (_speech && speech_id != 0)
-		playSpeech(speech_id, vgaSpriteId);
-	if ((getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE) && speech_id == 0)
+	if (_speech && speechId != 0)
+		playSpeech(speechId, vgaSpriteId);
+	if ((getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE) && speechId == 0)
 		kill_sprite_simon2(2, vgaSpriteId + 2);
 
-	if (string_ptr != NULL && (speech_id == 0 || _subtitles))
+	if (string_ptr != NULL && (speechId == 0 || _subtitles))
 		printScreenText(vgaSpriteId, color, (const char *)string_ptr, tl->x, tl->y, tl->width);
 
 }


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