[Scummvm-cvs-logs] SF.net SVN: scummvm:[39559] scummvm/branches/branch-0-13-0/engines/agos/ script_e2.cpp

[Kirben at users.sourceforge.net]

Revision: 39559
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39559&view=rev
Author:   Kirben
Date:     2009-03-20 10:08:31 +0000 (Fri, 20 Mar 2009)

Log Message:
-----------
Add work around for bug #2686883 - WAXWORKS: Crash in Jack the Ripper Zone.

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/agos/script_e2.cpp

Modified: scummvm/branches/branch-0-13-0/engines/agos/script_e2.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/agos/script_e2.cpp	2009-03-20 10:01:00 UTC (rev 39558)
+++ scummvm/branches/branch-0-13-0/engines/agos/script_e2.cpp	2009-03-20 10:08:31 UTC (rev 39559)
@@ -414,6 +414,16 @@
 	// 148: if door open
 	Item *i = getNextItemPtr();
 	uint16 d = getVarOrByte();
+
+	if (getGameType() == GType_WW) {
+		// WORKAROUND bug #2686883: A NULL item can occur when
+		// walking through Jack the Ripper scene
+		if (i == NULL) {
+			setScriptCondition(false);
+			return;
+		}
+	}
+
 	setScriptCondition(getDoorState(i, d) == 1);
 }
 


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