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

[Kirben at users.sourceforge.net]

Revision: 29544
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29544&view=rev
Author:   Kirben
Date:     2007-11-17 20:34:08 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
Switch invalid items back to error message, since restart state issues are fixed now..

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

Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp	2007-11-18 04:02:11 UTC (rev 29543)
+++ scummvm/trunk/engines/agos/items.cpp	2007-11-18 04:34:08 UTC (rev 29544)
@@ -382,13 +382,8 @@
 }
 
 Item *AGOSEngine::derefItem(uint 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;
-	}
-
+	if (item >= _itemArraySize)
+		error("derefItem: invalid item %d", item);
 	return _itemArrayPtr[item];
 }
 


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