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

svn-id: r22718

2 files changed, 7 insertions, 5 deletions

diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp
index 118796db19..af27c7f36c 100644
--- a/engines/scumm/plugin.cpp
+++ b/engines/scumm/plugin.cpp
@@ -991,6 +991,13 @@ static void detectGames(const FSList &fslist, Common::List<DetectorResult> &resu
 													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;
 							}
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index af963c0860..7704a0a2c1 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1288,11 +1288,6 @@ void ScummEngine_c64::resetScumm() {
 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;