diff options
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index b9a3875750..c6b747ee5a 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1937,15 +1937,9 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { _currentScript = 0xFF; } else if (ss->where == WIO_LOCAL) { if (ss->cutsceneOverride != 0) { - if (_gameId == GID_ZAK256 && _roomResource == 15 && ss->number == 202) { - // HACK to make Zak256 work (see bug #770093) - warning("Script %d stopped with active cutscene/override in exit", ss->number); - } else if (_gameId == GID_INDY3 && (_features & GF_OLD_BUNDLE) && _roomResource == 3) { - // HACK to make Indy3 Demo work - warning("Script %d stopped with active cutscene/override in exit", ss->number); - } else { + // Earlier games only checked global scripts at this point + if (_version >= 5) error("Script %d stopped with active cutscene/override in exit", ss->number); - } } _currentScript = 0xFF; } |