[Scummvm-cvs-logs] SF.net SVN: scummvm: [24251] scummvm/trunk/engines/agos/res.cpp
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Mon Oct 9 13:07:01 CEST 2006
Revision: 24251
http://svn.sourceforge.net/scummvm/?rev=24251&view=rev
Author: kirben
Date: 2006-10-09 04:06:56 -0700 (Mon, 09 Oct 2006)
Log Message:
-----------
Enable convert code for Amiga CD32 version of Simon1 too
Modified Paths:
--------------
scummvm/trunk/engines/agos/res.cpp
Modified: scummvm/trunk/engines/agos/res.cpp
===================================================================
--- scummvm/trunk/engines/agos/res.cpp 2006-10-09 10:26:27 UTC (rev 24250)
+++ scummvm/trunk/engines/agos/res.cpp 2006-10-09 11:06:56 UTC (rev 24251)
@@ -708,17 +708,17 @@
}
free(srcBuffer);
} else {
- //if (getGameId() == GID_SIMON1CD32) {
- // dst = (byte *)malloc(dstSize);
- // if (in.read(dst, dstSize) != dstSize)
- // error("loadVGAFile: Read failed");
- // convertAmiga(dst, dstSize);
- // free(dst);
- //} else {
+ if (getGameId() == GID_SIMON1CD32 && type == 2) {
+ dst = (byte *)malloc(dstSize);
+ if (in.read(dst, dstSize) != dstSize)
+ error("loadVGAFile: Read failed");
+ convertAmiga(dst, dstSize);
+ free(dst);
+ } else {
dst = allocBlock(dstSize + extraBuffer);
if (in.read(dst, dstSize) != dstSize)
error("loadVGAFile: Read failed");
- //}
+ }
}
in.close();
} else if (type != 3) {
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