[Scummvm-cvs-logs] SF.net SVN: scummvm:[53552] scummvm/trunk/engines/scumm/he

[Kirben at users.sourceforge.net]

Revision: 53552
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53552&view=rev
Author:   Kirben
Date:     2010-10-17 12:44:56 +0000 (Sun, 17 Oct 2010)

Log Message:
-----------
SCUMM: Fix bug #2952298 - HE (16Bit): Inventory items (Cursors) have wrong color.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/wiz_he.cpp
    scummvm/trunk/engines/scumm/he/wiz_he.h

Modified: scummvm/trunk/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.cpp	2010-10-16 22:33:09 UTC (rev 53551)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp	2010-10-17 12:44:56 UTC (rev 53552)
@@ -358,6 +358,7 @@
 
 void Wiz::writeColor(uint8 *dstPtr, int dstType, uint16 color) {
 	switch (dstType) {
+	case kDstCursor:
 	case kDstScreen:
 		WRITE_UINT16(dstPtr, color);
 		break;
@@ -1519,7 +1520,7 @@
 		cw = width;
 		ch = height;
 		dstPitch = cw * _vm->_bytesPerPixel;
-		dstType = kDstMemory;
+		dstType = (_cursorImage) ? kDstCursor : kDstMemory;
 	} else {
 		if (dstResNum) {
 			uint8 *dstPtr = _vm->getResourceAddress(rtImage, dstResNum);

Modified: scummvm/trunk/engines/scumm/he/wiz_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.h	2010-10-16 22:33:09 UTC (rev 53551)
+++ scummvm/trunk/engines/scumm/he/wiz_he.h	2010-10-17 12:44:56 UTC (rev 53552)
@@ -145,7 +145,8 @@
 enum DstSurface {
 	kDstScreen   = 0,
 	kDstMemory   = 1,
-	kDstResource = 2
+	kDstResource = 2,
+ 	kDstCursor   = 3
 };
 
 class ScummEngine_v71he;


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