libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Don't try to uninstantiate scripts marked as deleted

Browse Source 
Trying to delete a script marked as deleted should do nothing. Hoyle 3
tried to uninstantiate scripts more than once, and we incorrectly
decreased the reference count of associated scripts more than once,
thereby killing them. This properly fixes bug #3038837 (removed the
hack for it). Many many thanks to wjp for his help on this :)
This commit is contained in:
md5 2011-03-10 19:18:37 +02:00
parent 91d2d04f90
commit 0929d1e12d
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/sci/engine/seg_manager.cpp
View File

@ -1021,7 +1021,7 @@ void SegManager::uninstantiateScript(int script_nr) {
SegmentId segmentId = getScriptSegment(script_nr);
Script *scr = getScriptIfLoaded(segmentId);
if (!scr) { // Is it already unloaded?
if (!scr || scr->isMarkedAsDeleted()) { // Is it already unloaded?
//warning("unloading script 0x%x requested although not loaded", script_nr);
// This is perfectly valid SCI behaviour
return;
@ -1078,15 +1078,7 @@ void SegManager::uninstantiateScriptSci0(int script_nr) {
if (scr->getLockers())
scr->decrementLockers(); // Decrease lockers if this is us ourselves
} else {
if (g_sci->getGameId() == GID_HOYLE3 && (superclass_script == 0 || superclass_script >= 990)) {
// HACK for Hoyle 3: when exiting Checkers or Pachisi, scripts 0, 999 and some others
// are deleted but are never instantiated again. We ignore deletion of these scripts
// here for Hoyle 3 - bug #3038837
// TODO/FIXME: find out why this happens, seems like there is a problem with the object
// lock code
} else {
uninstantiateScript(superclass_script);
}
uninstantiateScript(superclass_script);
}
// Recurse to assure that the superclass lockers number gets decreased
}