libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 01:39:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This is normal for earlier games

Browse Source 
svn-id: r12967
This commit is contained in:
Travis Howell 2004-02-21 15:08:36 +00:00
parent d669bb7028
commit 099bd2cb47
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scumm/script.cpp
View File

@ -651,7 +651,9 @@ void ScummEngine::stopObjectCode() {
if (ss->where != WIO_GLOBAL && ss->where != WIO_LOCAL) {
if (ss->cutsceneOverride) {
warning("Object %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
// Earlier games only checked global scripts at this point
if (_version >= 5)
warning("Object %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
ss->cutsceneOverride = 0;
}
} else {
@ -819,8 +821,8 @@ void ScummEngine::killScriptsAndResources() {
}
ss->status = ssDead;
} else if (ss->where == WIO_LOCAL) {
// HACK to make Indy3 Demo work
if (ss->cutsceneOverride != 0 && !(_gameId == GID_INDY3 && (_features & GF_OLD_BUNDLE) && _roomResource == 3)) {
// Earlier games only checked global scripts at this point
if (ss->cutsceneOverride != 0 && _version >= 5) {
warning("Script %d stopped with active cutscene/override in exit", ss->number);
ss->cutsceneOverride = 0;
}
@ -1107,7 +1109,7 @@ void ScummEngine::beginOverride() {
fetchScriptByte();
fetchScriptWord();
// This is based on disassembly
// FIXME: why is this here? it doesn't seem to belong here?
VAR(VAR_OVERRIDE) = 0;
}

10
scumm/scummvm.cpp
View File

@ -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;
}