diff options
| author | Travis Howell | 2005-10-12 05:58:57 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-10-12 05:58:57 +0000 |
| commit | cd2c0f2e4781e99d1521c442b674624eb9efe6e2 (patch) | |
| tree | 11c7fd087e22b9c75028717dc40f99d58a001cdf /scumm | |
| parent | 706ea9db69dee1dabb12c487031592b8fd946414 (diff) | |
| download | scummvm-rg350-cd2c0f2e4781e99d1521c442b674624eb9efe6e2.tar.gz scummvm-rg350-cd2c0f2e4781e99d1521c442b674624eb9efe6e2.tar.bz2 scummvm-rg350-cd2c0f2e4781e99d1521c442b674624eb9efe6e2.zip | |
Revert last change and add a safe work around for bug.
svn-id: r19031
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v5.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 6d40de6bc9..f72d37a9ee 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -1820,9 +1820,7 @@ void ScummEngine_v5::o5_resourceRoutines() { break; default: - // FIXME: Reverted to a warning from an error, as per - // zak256 bug #1290485. This is not a proper fix. :) - warning("o5_resourceRoutines: default case %d", op); + error("o5_resourceRoutines: default case %d", op); } } @@ -2265,6 +2263,11 @@ void ScummEngine_v5::o5_startScript() { getWordVararg(data); + // FIXME: Script 171 loads a complete room resource, instead of the actual script. + // Causing invalid opcode cases, see bug #1290485 + if (_gameId == GID_ZAK256 && script == 171) + return; + if (!_copyProtection) { // Method used by original games to skip copy protection scheme if (_gameId == GID_LOOM && _currentRoom == 69 && script == 201) |