[Scummvm-cvs-logs] SF.net SVN: scummvm:[48810] scummvm/trunk/engines/sci/graphics/cursor.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 48810
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48810&view=rev
Author:   m_kiewitz
Date:     2010-04-26 21:01:05 +0000 (Mon, 26 Apr 2010)

Log Message:
-----------
SCI: fix regression from r48720, upscaled games that use view cursors crashed

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/cursor.cpp

Modified: scummvm/trunk/engines/sci/graphics/cursor.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/cursor.cpp	2010-04-26 19:10:15 UTC (rev 48809)
+++ scummvm/trunk/engines/sci/graphics/cursor.cpp	2010-04-26 21:01:05 UTC (rev 48810)
@@ -182,6 +182,7 @@
 		return;
 	}
 
+	celInfo->rawBitmap = cursorView->getBitmap(loopNum, celNum);
 	if (_upscaledHires) {
 		// Scale cursor by 2x - note: sierra didn't do this, but it looks much better
 		width *= 2;
@@ -191,7 +192,7 @@
 		cursorBitmap = new byte[width * height];
 		_screen->scale2x(celInfo->rawBitmap, cursorBitmap, celInfo->width, celInfo->height);
 	} else {
-		cursorBitmap = cursorView->getBitmap(loopNum, celNum);
+		cursorBitmap = celInfo->rawBitmap;
 	}
 
 	CursorMan.replaceCursor(cursorBitmap, width, height, cursorHotspot->x, cursorHotspot->y, clearKey);


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