[Scummvm-cvs-logs] SF.net SVN: scummvm: [22718] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 22718
Author:   fingolfin
Date:     2006-05-28 05:28:28 -0700 (Sun, 28 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22718&view=rev

Log Message:
-----------
Moved the hack that distinguishes MM V1 demo from the full version to a more appropriate location (so that the game gets correctly detected)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/plugin.cpp
    scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp	2006-05-28 12:23:49 UTC (rev 22717)
+++ scummvm/trunk/engines/scumm/plugin.cpp	2006-05-28 12:28:28 UTC (rev 22718)
@@ -991,6 +991,13 @@
 													md5str, dr.game.platform, d.md5Entry->platform);
 								dr.game.platform = d.md5Entry->platform;
 								
+								// HACK: Special case to distinguish the V1 demo from the full version
+								// (since they have identical MD5):
+								if (dr.game.id == GID_MANIAC && !strcmp(gfp->pattern, "%02d.MAN")) {
+									dr.game.features |= GF_DEMO;
+									dr.extra = "V1 Demo";
+								}
+								
 								results.push_back(dr);
 								break;
 							}

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-05-28 12:23:49 UTC (rev 22717)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-05-28 12:28:28 UTC (rev 22718)
@@ -1288,11 +1288,6 @@
 void ScummEngine_v2::resetScumm() {
 	ScummEngine::resetScumm();
 
-	// To detect V1 demo of Maniac Mansion
-	if (_game.id == GID_MANIAC && !strcmp(_filenamePattern.pattern, "%02d.MAN")) {
-		_game.features |= GF_DEMO;
-	}
-
 	if (_game.platform == Common::kPlatformNES) {
 		initNESMouseOver();
 		_switchRoomEffect2 = _switchRoomEffect = 6;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.