[Scummvm-cvs-logs] SF.net SVN: scummvm: [24345] scummvm/trunk/engines/agos

kirben at users.sourceforge.net kirben at users.sourceforge.net
Mon Oct 16 06:40:55 CEST 2006


Revision: 24345
          http://svn.sourceforge.net/scummvm/?rev=24345&view=rev
Author:   kirben
Date:     2006-10-15 21:40:50 -0700 (Sun, 15 Oct 2006)

Log Message:
-----------
Add work around for converter crash in Amiga version of WW for now 

Modified Paths:
--------------
    scummvm/trunk/engines/agos/res.cpp
    scummvm/trunk/engines/agos/res_ami.cpp

Modified: scummvm/trunk/engines/agos/res.cpp
===================================================================
--- scummvm/trunk/engines/agos/res.cpp	2006-10-16 04:31:09 UTC (rev 24344)
+++ scummvm/trunk/engines/agos/res.cpp	2006-10-16 04:40:50 UTC (rev 24345)
@@ -731,10 +731,10 @@
 			(getFeatures() & GF_CRUNCHED && type != 3)) {
 			byte *srcBuffer = (byte *)malloc(srcSize);
 			if (in.read(srcBuffer, srcSize) != srcSize)
-			error("loadVGAFile: Read failed");
+				error("loadVGAFile: Read failed");
 
 			dstSize = READ_BE_UINT32(srcBuffer + srcSize - 4);
-			if (type == 2 && dstSize != 64800) {
+			if (type == 2) {
 				dst = (byte *)malloc(dstSize);
 				decrunchFile(srcBuffer, dst, srcSize);
 				convertAmiga(dst, dstSize);

Modified: scummvm/trunk/engines/agos/res_ami.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_ami.cpp	2006-10-16 04:31:09 UTC (rev 24344)
+++ scummvm/trunk/engines/agos/res_ami.cpp	2006-10-16 04:40:50 UTC (rev 24345)
@@ -260,6 +260,14 @@
 }
 
 void AGOSEngine::convertAmiga(byte *srcBuf, int32 fileSize) {
+	// TODO Better detection of full screen images
+	if ((getGameType() == GType_WW && fileSize == 178624) ||
+		fileSize == 64800) {
+		byte *dstBuf = allocBlock (fileSize);
+		memcpy(dstBuf, srcBuf, fileSize);
+		return;
+	}
+
 	uint32 clipoffset, outlength;
 	uint16 clipwidth, clipheight;
 	byte *clipsend;


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