[Scummvm-cvs-logs] SF.net SVN: scummvm:[50279] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 50279
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50279&view=rev
Author:   thebluegr
Date:     2010-06-25 17:59:49 +0000 (Fri, 25 Jun 2010)

Log Message:
-----------
Removed the getHunkPointer error - it's valid SCI behavior (e.g. when loading/quitting sometimes, since hunks are not saved). We check for valid hunk pointers anyway, so there's no reason for the warning/error

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/seg_manager.cpp
    scummvm/trunk/engines/sci/graphics/paint16.cpp

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-06-25 17:59:48 UTC (rev 50278)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-06-25 17:59:49 UTC (rev 50279)
@@ -454,7 +454,7 @@
 	HunkTable *ht = (HunkTable *)getSegment(addr.segment, SEG_TYPE_HUNK);
 
 	if (!ht || !ht->isValidEntry(addr.offset)) {
-		error("getHunkPointer() with invalid handle %04x:%04x", PRINT_REG(addr));
+		// Valid SCI behavior, e.g. when loading/quitting
 		return NULL;
 	}
 

Modified: scummvm/trunk/engines/sci/graphics/paint16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/paint16.cpp	2010-06-25 17:59:48 UTC (rev 50278)
+++ scummvm/trunk/engines/sci/graphics/paint16.cpp	2010-06-25 17:59:49 UTC (rev 50279)
@@ -330,7 +330,8 @@
 
 	memoryId = _segMan->allocateHunkEntry("SaveBits()", size);
 	memoryPtr = _segMan->getHunkPointer(memoryId);
-	_screen->bitsSave(workerRect, screenMask, memoryPtr);
+	if (memoryPtr)
+		_screen->bitsSave(workerRect, screenMask, memoryPtr);
 	return memoryId;
 }
 


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