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

Fix Indy3/Loom override bugs. THIS MAY BREAK OTHER GAMES. Please test.

Browse source 
svn-id: r3876
This commit is contained in:
James Brown 2002-04-05 16:41:02 +00:00
parent 53b3cf6838
commit 2e0443e741
3 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
script_v1.cpp
View file

@ -874,9 +874,8 @@ void Scumm::o5_chainScript() {
cur = _currentScript;
if (vm.slot[cur].cutsceneOverride != 0) {
error("Script %d chaining with active cutscene/override");
}
if (vm.slot[cur].cutsceneOverride != 0)
error("Script %d chaining with active cutscene/override");
vm.slot[cur].number = 0;
vm.slot[cur].status = 0;
@ -2105,8 +2104,9 @@ void Scumm::o5_stopScript() {
int script;
script = getVarOrDirectByte(0x80);
if (script==0)
stopObjectCode();
if (!script)
// stopObjectCode(); // ENDER - wrong?
stopScriptNr(_currentScript);
else
stopScriptNr(script);
}