diff options
author | Travis Howell | 2004-08-20 01:26:56 +0000 |
---|---|---|
committer | Travis Howell | 2004-08-20 01:26:56 +0000 |
commit | 6a2306c9690a784ef03d9c98e84b673986b57feb (patch) | |
tree | fe125ba6d0356a9139bb966fadac2a6e56baa51d | |
parent | e11787a494a2a7def5be1ba41cc4002de81f0c7e (diff) | |
download | scummvm-rg350-6a2306c9690a784ef03d9c98e84b673986b57feb.tar.gz scummvm-rg350-6a2306c9690a784ef03d9c98e84b673986b57feb.tar.bz2 scummvm-rg350-6a2306c9690a784ef03d9c98e84b673986b57feb.zip |
Enable original method of skipping copy protection
svn-id: r14645
-rw-r--r-- | scumm/script.cpp | 8 | ||||
-rw-r--r-- | scumm/script_v5.cpp | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index ac6c498082..2f941eebf3 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -497,9 +497,6 @@ int ScummEngine::readVar(uint var) { if (var == 490 && _gameId == GID_MONKEY2 && !copyprotbypassed) { copyprotbypassed = true; var = 518; - } else if (var == 179 && (_gameId == GID_MONKEY_VGA || _gameId == GID_MONKEY_EGA) && !copyprotbypassed) { - copyprotbypassed = true; - var = 266; } } @@ -526,10 +523,7 @@ int ScummEngine::readVar(uint var) { // during the game... if (_gameId == GID_INDY3 && (_features & GF_OLD_BUNDLE) && var == 94 && bit == 4) { return 0; - } else if (var == 221 && bit == 14 && _gameId == GID_LOOM && (_features & GF_MACINTOSH)) { // For Mac Loom - return 0; - // For all other Loom versions? PC and FM Towns at least in any event - } else if (_gameId == GID_LOOM && var == 214 && bit == 15) { // For PC Loom + } else if (_gameId == GID_LOOM && (_features & GF_FMTOWNS) && var == 214 && bit == 15) { return 0; } else if (_gameId == GID_ZAK256 && var == 151 && bit == 8) { return 0; diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 7cae2d1930..3a266ecfd2 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -2203,7 +2203,6 @@ void ScummEngine_v5::o5_startScript() { getWordVararg(data); -/* if (!_copyProtection) { // Method used by original games to skip copy protection scheme if (_gameId == GID_LOOM && _currentRoom == 69 && script == 201) @@ -2211,7 +2210,6 @@ void ScummEngine_v5::o5_startScript() { else if ((_gameId == GID_MONKEY_VGA || _gameId == GID_MONKEY_EGA) && script == 152) return; } -*/ runScript(script, (op & 0x20) != 0, (op & 0x40) != 0, data); } |