[Scummvm-cvs-logs] SF.net SVN: scummvm:[34635] scummvm/trunk/engines/scumm/object.cpp

[fingolfin at users.sourceforge.net]

Revision: 34635
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34635&view=rev
Author:   fingolfin
Date:     2008-09-23 11:43:57 +0000 (Tue, 23 Sep 2008)

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

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/object.cpp

Modified: scummvm/trunk/engines/scumm/object.cpp
===================================================================
--- scummvm/trunk/engines/scumm/object.cpp	2008-09-23 10:10:29 UTC (rev 34634)
+++ scummvm/trunk/engines/scumm/object.cpp	2008-09-23 11:43:57 UTC (rev 34635)
@@ -109,6 +109,13 @@
 
 	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);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.