[Scummvm-cvs-logs] SF.net SVN: scummvm:[34082] scummvm/branches/branch-0-12-0/engines/cine/ anim.cpp

[buddha_ at users.sourceforge.net]

Revision: 34082
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34082&view=rev
Author:   buddha_
Date:     2008-08-21 14:14:52 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
Fix for bug #2057619: FW: Glitches in title display of demo (regression).
This fix doesn't seem to break other Future Wars versions like r34040 did.
Some versions of TITRE.ANI use 15 for transparency color, others use 0.
Previously only one of the choices was supported, now both are recognized.

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/cine/anim.cpp

Modified: scummvm/branches/branch-0-12-0/engines/cine/anim.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/cine/anim.cpp	2008-08-21 14:14:33 UTC (rev 34081)
+++ scummvm/branches/branch-0-12-0/engines/cine/anim.cpp	2008-08-21 14:14:52 UTC (rev 34082)
@@ -570,6 +570,14 @@
 
 	transparentColor = getAnimTransparentColor(resourceName);
 
+	// TODO: Merge this special case into getAnimTransparentColor somehow.
+	// Versions of TITRE.ANI with height 37 use color 0xF for transparency.
+	// Versions of TITRE.ANI with height 57 use color 0x0 for transparency.
+	// Fixes bug #2057619: FW: Glitches in title display of demo (regression).
+	if (scumm_stricmp(resourceName, "TITRE.ANI") == 0 && animHeader.frameHeight == 37) {
+		transparentColor = 0xF;
+	}
+
 	for (int16 i = 0; i < animHeader.numFrames; i++, entry++) {
 		entry = emptyAnimSpace(entry);
 		assert(entry >= 0);


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