[Scummvm-cvs-logs] SF.net SVN: scummvm:[50015] scummvm/trunk/engines/sci/resource.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Fri Jun 18 14:15:33 CEST 2010


Revision: 50015
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50015&view=rev
Author:   thebluegr
Date:     2010-06-18 12:15:33 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
Don't throw a warning when we can't find hires content

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-06-18 10:49:26 UTC (rev 50014)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-18 12:15:33 UTC (rev 50015)
@@ -1911,16 +1911,18 @@
 				// SCI32 picture
 				uint16 width = READ_LE_UINT16(res->data + 10);
 				uint16 height = READ_LE_UINT16(res->data + 12);
+				// Surely lowres (e.g. QFG4CD)
 				if ((width == 320) && ((height == 190) || (height == 200)))
 					return false;
+				// Surely hires
 				if ((width >= 600) || (height >= 400))
 					return true;
 			}
 		}
 	}
 
-	// This is fine for (some?) low-res sci32 games, because in those games the picture size is specified as 0, 0
-	warning("resMan: Couldn't detect hires");
+	// We haven't been able to find hires content
+
 	return false;
 #else
 	error("no sci32 support");


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