[Scummvm-cvs-logs] SF.net SVN: scummvm: [21274] scummvm/trunk/engines/scumm/string.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Tue Mar 14 01:34:03 CET 2006


Revision: 21274
Author:   kirben
Date:     2006-03-14 01:33:37 -0800 (Tue, 14 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21274&view=rev

Log Message:
-----------
Camera scrolling only effects subtitles in SCUMM4-6 games. Fixes bug #1329482.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/string.cpp
Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2006-03-14 07:45:46 UTC (rev 21273)
+++ scummvm/trunk/engines/scumm/string.cpp	2006-03-14 09:33:37 UTC (rev 21274)
@@ -419,7 +419,7 @@
 	if (!_haveMsg)
 		return;
 
-	if (!(_game.features & GF_NEW_CAMERA) && !(_game.id == GID_ZAK && (_game.platform == Common::kPlatformFMTowns) && getTalkingActor() == 0xFF)) {
+	if (_game.version >= 4 && _game.version <= 6) {
 		if ((camera._dest.x / 8) != (camera._cur.x / 8) || camera._cur.x != camera._last.x)
 			return;
 	}


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