aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-07-15 04:31:17 +0000
committerTravis Howell2006-07-15 04:31:17 +0000
commitc179895316a1d3f7eb19110016e0c4248da292a8 (patch)
tree7bcb7c146ff08164517614c79a85fe821e1d802a
parentd3a4d86158b072eca8eb196d51ccbd1d10f0a99a (diff)
downloadscummvm-rg350-c179895316a1d3f7eb19110016e0c4248da292a8.tar.gz
scummvm-rg350-c179895316a1d3f7eb19110016e0c4248da292a8.tar.bz2
scummvm-rg350-c179895316a1d3f7eb19110016e0c4248da292a8.zip
There are no known releases of indy3ega/monkeyega that require this bypass
svn-id: r23502
-rw-r--r--README2
-rw-r--r--doc/games-copyprot.tex2
-rw-r--r--engines/scumm/script_v5.cpp4
3 files changed, 2 insertions, 6 deletions
diff --git a/README b/README
index 264237ebfa..938e9a7489 100644
--- a/README
+++ b/README
@@ -217,9 +217,7 @@ ScummVM will skip copy protection in the following games:
Maniac Mansion
Zak McKracken and the Alien Mindbenders
-Indiana Jones and the Last Crusade (EGA)
Loom (EGA)
-The Secret of Monkey Island (EGA)
The Secret of Monkey Island (VGA)
Monkey Island 2: LeChuck's Revenge
diff --git a/doc/games-copyprot.tex b/doc/games-copyprot.tex
index 0ee734bb87..f8aea67e07 100644
--- a/doc/games-copyprot.tex
+++ b/doc/games-copyprot.tex
@@ -15,9 +15,7 @@ ScummVM will skip copy protection in the following games:
\begin{tabular}{l}
Maniac Mansion\\
Zak McKracken and the Alien Mindbenders\\
-Indiana Jones and the Last Crusade (EGA)\\
Loom (EGA)\\
-The Secret of Monkey Island (EGA)\\
The Secret of Monkey Island (VGA)\\
Monkey Island 2: LeChuck's Revenge\\
\end{tabular}
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 92560514bd..0ec10e4c6f 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -2235,14 +2235,14 @@ void ScummEngine_v5::o5_startScript() {
// FIXME: Script 171 loads a complete room resource, instead of the actual script.
// Causing invalid opcode cases, see bug #1290485
- if (_game.id == GID_ZAK && (_game.platform == Common::kPlatformFMTowns) && script == 171)
+ if (_game.id == GID_ZAK && _game.platform == Common::kPlatformFMTowns && script == 171)
return;
if (!_copyProtection) {
// Method used by original games to skip copy protection scheme
if (_game.id == GID_LOOM && _game.version == 3 && _currentRoom == 69 && script == 201)
script = 205;
- else if ((_game.id == GID_MONKEY_VGA || _game.id == GID_MONKEY_EGA) && script == 152)
+ if (_game.id == GID_MONKEY_VGA && _game.platform == Common::kPlatformPC && script == 152)
return;
}