[Scummvm-cvs-logs] SF.net SVN: scummvm: [20882] scummvm/trunk/engines/scumm/scumm.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Feb 25 10:25:01 CET 2006
Revision: 20882
Author: fingolfin
Date: 2006-02-25 10:24:22 -0800 (Sat, 25 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20882&view=rev
Log Message:
-----------
Moved check for unknown MD5 checksum from ScummEngine::ScummEngine to Engine_SCUMM_create
Modified Paths:
--------------
scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2006-02-25 18:16:40 UTC (rev 20881)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2006-02-25 18:24:22 UTC (rev 20882)
@@ -1215,21 +1215,6 @@
// Clean _substResFileNameBundle
memset(&_substResFileNameBundle, 0, sizeof(_substResFileNameBundle));
- // Check for unknown MD5
- char md5str[32+1];
- for (int j = 0; j < 16; j++) {
- sprintf(md5str + j*2, "%02x", (int)md5sum[j]);
- }
- const MD5Table *elem;
-#ifdef PALMOS_68K
- uint32 arraySize = MemPtrSize((void *)md5table) / sizeof(MD5Table) - 1;
-#else
- uint32 arraySize = ARRAYSIZE(md5table) - 1;
-#endif
- elem = (const MD5Table *)bsearch(md5str, md5table, arraySize, sizeof(MD5Table), compareMD5Table);
- if (!elem)
- printf("Unknown MD5 (%s)! Please report the details (language, platform, etc.) of this game to the ScummVM team\n", md5str);
-
_defaultFTSentenceScript = -1;
_buggyFTSentenceScript = -1;
@@ -3590,6 +3575,17 @@
game.midi = MDT_TOWNS;
}
+ // Check for unknown MD5 checksums, and print a message if we encounter one.
+ const MD5Table *elem;
+#ifdef PALMOS_68K
+ uint32 arraySize = MemPtrSize((void *)md5table) / sizeof(MD5Table) - 1;
+#else
+ uint32 arraySize = ARRAYSIZE(md5table) - 1;
+#endif
+ elem = (const MD5Table *)bsearch(md5, md5table, arraySize, sizeof(MD5Table), compareMD5Table);
+ if (!elem)
+ printf("Unknown MD5 (%s)! Please report the details (language, platform, etc.) of this game to the ScummVM team\n", md5);
+
// Finally, we have massaged the GameSettings to our satisfaction, and can
// instantiate the appropriate game engine. Hooray!
switch (game.version) {
More information about the Scummvm-git-logs
mailing list