thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up debugger Restart function and move to SCUMM restart function

Browse source 
svn-id: r8263
This commit is contained in:
James Brown 2003-06-02 05:38:45 +00:00
parent ee886a6be2
commit 9be08a55f9
3 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scumm/script.cpp
View file

@ -789,13 +789,17 @@ void Scumm::killScriptsAndResources() {
ss = vm.slot;
for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++) {
if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) {
if (ss->cutsceneOverride != 0)
error("Object %d stopped with active cutscene/override in exit", ss->number);
if (ss->cutsceneOverride != 0) {
warning("Object %d stopped with active cutscene/override in exit", ss->number);
ss->cutsceneOverride = 0;
}
ss->status = ssDead;
} else if (ss->where == WIO_LOCAL) {
// HACK to make Indy3 Demo work
if (ss->cutsceneOverride != 0 && !(_gameId == GID_INDY3 && _roomResource == 3))
error("Script %d stopped with active cutscene/override in exit", ss->number);
if (ss->cutsceneOverride != 0 && !(_gameId == GID_INDY3 && _roomResource == 3)) {
warning("Script %d stopped with active cutscene/override in exit", ss->number);
ss->cutsceneOverride = 0;
}
ss->status = ssDead;
}
}