[Scummvm-cvs-logs] SF.net SVN: scummvm: [27844] scummvm/trunk/engines/agos/script_e2.cpp

[Kirben at users.sourceforge.net]

Revision: 27844
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27844&view=rev
Author:   Kirben
Date:     2007-07-01 17:14:53 -0700 (Sun, 01 Jul 2007)

Log Message:
-----------
Add work around for possible script bug in Elvira 2.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/script_e2.cpp

Modified: scummvm/trunk/engines/agos/script_e2.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e2.cpp	2007-07-01 23:58:09 UTC (rev 27843)
+++ scummvm/trunk/engines/agos/script_e2.cpp	2007-07-02 00:14:53 UTC (rev 27844)
@@ -652,6 +652,16 @@
 	// 179: item unk1 unk2 is
 	Item *item = getNextItemPtr();
 	int16 a = getNextWord(), b = getNextWord();
+
+	if (getGameType() == GType_ELVIRA2) {
+		// WORKAROUND: A NULL item can occur when interacting with Wine Bottles
+		if (item == NULL) {
+			printf("Please report where exactly this occurs in Elvira 2.\n");
+			setScriptCondition(false);
+			return;
+		}
+	}
+
 	setScriptCondition(item->adjective == a && item->noun == b);
 }
 


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