[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.472.2.1,1.472.2.2
Travis Howell
kirben at users.sourceforge.net
Thu Dec 16 04:52:06 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon cursor.cpp,1.1,1.2 icons.cpp,1.1,1.2 saveload.cpp,1.1,1.2 module.mk,1.9,1.10 simon.cpp,1.473,1.474
- Next message: [Scummvm-cvs-logs] CVS: scummvm NEWS,1.87.2.1,1.87.2.2 configure,1.106,1.106.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22204/simon
Modified Files:
Tag: release-0-7-0
simon.cpp
Log Message:
Remove md5 hack
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.472.2.1
retrieving revision 1.472.2.2
diff -u -d -r1.472.2.1 -r1.472.2.2
--- simon.cpp 16 Dec 2004 12:35:39 -0000 1.472.2.1
+++ simon.cpp 16 Dec 2004 12:51:17 -0000 1.472.2.2
@@ -304,37 +304,6 @@
ConfMan.set("platform", "Windows");
}
ConfMan.flushToDisk();
- } else {
-#if 1
- // HACK HACK HACK
- // This is not how, and where, MD5 computation should be done in the
- // real world. Rather this is meant as a proof-of-concept hack.
- // It's quick, it's dirty, and it'll go again eventually :-)
- char buf[100];
- uint8 md5sum[16];
- File f;
-
- sprintf(buf, g->detectname);
- f.open(buf);
- if (f.isOpen() == false)
- strcat(buf, ".");
-
- if (md5_file(buf, md5sum)) {
- char md5str[32+1];
- for (int j = 0; j < 16; j++) {
- sprintf(md5str + j*2, "%02x", (int)md5sum[j]);
- }
-
- printf("%s %s\n", md5str, buf);
- const MD5Table *elem;
- elem = (const MD5Table *)bsearch(md5str, md5table, ARRAYSIZE(md5table)-1, sizeof(MD5Table), compareMD5Table);
- if (elem)
- printf("Match found in database: target %s, language %s, platform %s\n",
- elem->target, Common::getLanguageDescription(elem->language), Common::getPlatformDescription(elem->platform));
- else
- printf("Unknown MD5! Please report the details (language, platform, etc.) of this game to the ScummVM team\n");
- }
-#endif
}
VGA_DELAY_BASE = 1;
@@ -3728,6 +3697,7 @@
error("read_vga_from_datfile_2: read failed");
dst = setup_vga_destination (READ_BE_UINT32(buffer + size - 4) + extraBuffer);
decrunch_file_amiga (buffer, dst, size);
+ delete [] buffer;
} else {
dst = setup_vga_destination(size + extraBuffer);
if (in.read(dst, size) != size)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon cursor.cpp,1.1,1.2 icons.cpp,1.1,1.2 saveload.cpp,1.1,1.2 module.mk,1.9,1.10 simon.cpp,1.473,1.474
- Next message: [Scummvm-cvs-logs] CVS: scummvm NEWS,1.87.2.1,1.87.2.2 configure,1.106,1.106.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list