diff options
| author | Willem Jan Palenstijn | 2009-09-28 20:21:09 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-09-28 20:21:09 +0000 |
| commit | 88a9099949ebd2409878cdb9ee7d3d329ead1ad8 (patch) | |
| tree | 9ab29e12b8cc3d15ded5bd9ef65d319b032025d2 /engines/sci/engine/kscripts.cpp | |
| parent | f413356bed8399e93aa9cdfc48f574e157d9fcb1 (diff) | |
| download | scummvm-rg350-88a9099949ebd2409878cdb9ee7d3d329ead1ad8.tar.gz scummvm-rg350-88a9099949ebd2409878cdb9ee7d3d329ead1ad8.tar.bz2 scummvm-rg350-88a9099949ebd2409878cdb9ee7d3d329ead1ad8.zip | |
SCI: Remove unsafe unmarkDeleted function.
It did not undo all effects of a script being deleted (specifically its
superclasses remain unlocked), causing an inconsistent
state. Also removed EcoQuest CD hack that worked around a specific
instance of this problem.
svn-id: r44449
Diffstat (limited to 'engines/sci/engine/kscripts.cpp')
| -rw-r--r-- | engines/sci/engine/kscripts.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp index f9ec052d0f..e868a58836 100644 --- a/engines/sci/engine/kscripts.cpp +++ b/engines/sci/engine/kscripts.cpp @@ -218,12 +218,6 @@ reg_t kDisposeScript(EngineState *s, int, int argc, reg_t *argv) { if (scr) { if (s->_executionStack.back().addr.pc.segment != id) scr->setLockers(1); - - // HACK for EcoQuest CD - if (s->_gameName == "ecoquest" && script == 821) { - warning("kDisposeScript hack for EcoQuest 1 CD: not disposing script 821"); - scr->setLockers(2); - } } script_uninstantiate(s->segMan, script); |