[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.522,1.523

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1388

Modified Files:
	scumm.cpp 
Log Message:
Improve MM NES & C64 games autodetection. 
Fixes bug #1190565 "MM NES: autodetect not working"


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -d -r1.522 -r1.523
--- scumm.cpp	19 May 2005 14:15:24 -0000	1.522
+++ scumm.cpp	19 May 2005 22:14:49 -0000	1.523
@@ -2564,12 +2564,13 @@
 					const char *name = file->displayName().c_str();
 
 					if (0 == scumm_stricmp(detectName, name)) {
+						byte buf[6];
+
 						if (g->version <= 4) {
 							// We take a look at the file now, to narrow
 							// down the list of possible candidates a bit further.
 							// E.g. it's trivial to distinguish V1 from V3 games.
 							File tmp;
-							byte buf[6];
 							if (!tmp.open(file->path().c_str()))
 								break;
 							tmp.read(buf, 6);
@@ -2675,6 +2676,23 @@
 								_numScripts 199
 								_numSounds 199
 								*/
+							} else if (buf[0] == 0xa0 && buf[1] == 0x07 && buf[2] == 0xa5 &&
+									   buf[3] == 0xbc) {
+								// MM NES .prg
+								if (g->id != GID_MANIAC)
+									break;
+							} else if (buf[0] == 0xbc && buf[1] == 0xb9) {
+								// MM NES 00.LFL
+								if (g->id != GID_MANIAC)
+									break;
+							} else if (buf[0] == 0x31 && buf[1] == 0x0a) {
+								// C64 MM & Zak disk1
+								if (g->version != 2)
+									break;
+							} else if (buf[0] == 0xcd && buf[1] == 0xfe) {
+								// C64 MM & Zak 00.LFL
+								if (g->version != 2)
+									break;
 							} else {
 								// This is not a V1-V4 game
 								break;
@@ -2689,6 +2707,17 @@
 																 Common::UNK_LANG, 
 																 Common::kPlatformMacintosh));
 							fileSet[file->path()] = true;
+						} else if (substLastIndex == 0 && g->id == GID_MANIAC && 
+								   (buf[0] == 0xbc || buf[0] == 0xa0)) {
+							detectedGames.push_back(DetectedGame(g->toGameSettings(), 
+																 Common::UNK_LANG, 
+																 Common::kPlatformNES));
+						} else if ((g->id == GID_MANIAC || g->id == GID_ZAK) && 
+								   ((buf[0] == 0x31 && buf[1] == 0x0a) ||
+									(buf[0] == 0xcd && buf[1] == 0xfe))) {
+							detectedGames.push_back(DetectedGame(g->toGameSettings(), 
+																 Common::UNK_LANG, 
+																 Common::kPlatformC64));
 						} else {
 							detectedGames.push_back(g->toGameSettings());
 							fileSet[file->path()] = false;