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

[Kirben at users.sourceforge.net]

Revision: 28258
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28258&view=rev
Author:   Kirben
Date:     2007-07-28 01:05:47 -0700 (Sat, 28 Jul 2007)

Log Message:
-----------
Switch error back to debug message, due to strange data in restart state files.

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

Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp	2007-07-28 07:56:58 UTC (rev 28257)
+++ scummvm/trunk/engines/agos/items.cpp	2007-07-28 08:05:47 UTC (rev 28258)
@@ -382,8 +382,13 @@
 }
 
 Item *AGOSEngine::derefItem(uint item) {
-	if (item >= _itemArraySize)
-		error("derefItem: invalid item %d", item);
+	// Occurs when loading item store from restart state in
+	// Elvira 2 (Amiga/AtariST) and Waxworks (Amiga).
+	if (item >= _itemArraySize) {
+		debug(0, "derefItem: invalid item %d", item);
+		return NULL;
+	}
+
 	return _itemArrayPtr[item];
 }
 


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