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

Fix for bug #1917981: Game crash when finishing Indy3 demo. At the same time, added a new paranoia check

Browse Source 
svn-id: r34635
This commit is contained in:
Max Horn 2008-09-23 11:43:57 +00:00
parent 65ef827349
commit 618e7f3e31
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/scumm/object.cpp
View File

@ -109,6 +109,13 @@ void ScummEngine::setOwnerOf(int obj, int owner) {
int arg = (_game.version >= 6) ? obj : 0;
// WORKAROUND for bug #1917981: Game crash when finishing Indy3 demo.
// Script 94 tries to empty the inventory but does so in a bogus way.
// This causes it to try to remove object 0 from the inventory.
if (_game.id == GID_PASS && obj == 0 && vm.slot[_currentScript].number == 94)
return;
assert(obj > 0);
if (owner == 0) {
clearOwnerOf(obj);