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

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sat Apr 29 05:36:01 CEST 2006


Revision: 22216
Author:   kirben
Date:     2006-04-29 05:35:46 -0700 (Sat, 29 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22216&view=rev

Log Message:
-----------
Add FF difference in o_screenTextMsg()

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-29 12:29:21 UTC (rev 22215)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-29 12:35:46 UTC (rev 22216)
@@ -1312,8 +1312,10 @@
 	tl = getTextLocation(vgaSpriteId);
 	if (_speech && speechId != 0)
 		playSpeech(speechId, vgaSpriteId);
-	if ((getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE) && speechId == 0)
+	if (((getGameType() == GType_SIMON2 && (getFeatures() & GF_TALKIE)) || getGameType() == GType_FF) &&
+		speechId == 0) {
 		stopAnimateSimon2(2, vgaSpriteId + 2);
+	}
 
 	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.





More information about the Scummvm-git-logs mailing list