From 2f60f4485da6906e82ffebecd406d9c2918b5343 Mon Sep 17 00:00:00 2001
From: Travis Howell <kirben@scummvm.org>
Date: Thu, 4 Mar 2004 02:47:39 +0000
Subject: [PATCH] Allow --demo-mode with maniac (Enchanced)

svn-id: r13173
---
 README                | 2 +-
 base/gameDetector.cpp | 2 +-
 doc/08.tex            | 2 +-
 scumm/scummvm.cpp     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index a7ff8bba711..0fe149f24f8 100644
--- a/README
+++ b/README
@@ -984,7 +984,7 @@ The following keywords are recognized:
 
         copy_protection bool     Enable copy protection in SCUMM games ,when
                                  ScummVM disables it by default.
-        demo_mode       bool     Start demo in Maniac Mansion (Classic version)
+        demo_mode       bool     Start demo in Maniac Mansion
         alt_intro       bool     Use alternative intro for CD versions of
                                  Beneath a Steel Sky and Flight of the Amazon
                                  Queen
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 037a3efce96..095153f73e3 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -85,7 +85,7 @@ static const char USAGE_STRING[] =
 #endif
 #ifndef DISABLE_SCUMM
 	"  --copy-protection        Enable the original copy protection in SCUMM games\n"
-	"  --demo-mode              Start demo mode of Maniac Mansion (Classic version)\n"
+	"  --demo-mode              Start demo mode of Maniac Mansion\n"
 	"  --tempo=NUM              Set music tempo (in percent, 50-200) for SCUMM games\n"
 	"                           (default: 100)\n"
 	"  --talkspeed=NUM          Set talk speed for SCUMM games (default: 60)\n"
diff --git a/doc/08.tex b/doc/08.tex
index 329fcd98941..6d335eeabab 100644
--- a/doc/08.tex
+++ b/doc/08.tex
@@ -104,7 +104,7 @@ The following keywords are recognized:
 \\
         copy\_protection&bool     Enable copy protection in SCUMM games ,when\\
                         &         ScummVM disables it by default.\\
-        demo\_mode      &bool     Start demo in Maniac Mansion (Classic version)\\
+        demo\_mode      &bool     Start demo in Maniac Mansion\\
         alt\_intro      &bool     Use alternative intro for CD versions of \\
                         &         Beneath a Steel Sky and Flight of the Amazon\\
                         &         Queen
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index e3b81bc3a64..b4e25861ea5 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -971,7 +971,7 @@ void ScummEngine::launch() {
 		args[0] = _bootParam;	
 
 		_saveLoadFlag = 0;
-		if (_gameId == GID_MANIAC && _version == 1 && _demoMode)
+		if (_gameId == GID_MANIAC && _demoMode)
 			runScript(9, 0, 0, args);
 		else
 			runScript(1, 0, 0, args);