[Scummvm-cvs-logs] SF.net SVN: scummvm:[43676] scummvm/trunk/engines/made/resource.cpp

[mthreepwood at users.sourceforge.net]

Revision: 43676
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43676&view=rev
Author:   mthreepwood
Date:     2009-08-23 21:15:47 +0000 (Sun, 23 Aug 2009)

Log Message:
-----------
Fix bug #2843050 (RTZ: Crash to desktop with demo). Don't assert out when a resource slot can't be found.

Modified Paths:
--------------
    scummvm/trunk/engines/made/resource.cpp

Modified: scummvm/trunk/engines/made/resource.cpp
===================================================================
--- scummvm/trunk/engines/made/resource.cpp	2009-08-23 20:40:09 UTC (rev 43675)
+++ scummvm/trunk/engines/made/resource.cpp	2009-08-23 21:15:47 UTC (rev 43676)
@@ -525,7 +525,10 @@
 
 ResourceSlot *ResourceReader::getResourceSlot(uint32 resType, uint index) {
 	ResourceSlots *slots = _resSlots[resType];
-	assert(slots);
+	
+	if (!slots)
+		return NULL;
+
 	if (index >= 1 && index < slots->size()) {
 		return &(*slots)[index];
 	} else {


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