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

sev at users.sourceforge.net sev at users.sourceforge.net
Sat Apr 8 20:34:31 CEST 2006


Revision: 21711
Author:   sev
Date:     2006-04-08 20:16:05 -0700 (Sat, 08 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21711&view=rev

Log Message:
-----------
Fix regression introduced by removing of GF_HE_CURSORLESS feature flag.
There are 3 cases of HE cursors:
o Default one. We set up cursor palette for it.
o Loaded from .HE3 (windows resource file). We use default cursor palette.
o Loaded from WizImage. We disable default cursor palette.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/resource_he.cpp
    scummvm/trunk/engines/scumm/he/wiz_he.cpp
Modified: scummvm/trunk/engines/scumm/he/resource_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/resource_he.cpp	2006-04-09 01:59:47 UTC (rev 21710)
+++ scummvm/trunk/engines/scumm/he/resource_he.cpp	2006-04-09 03:16:05 UTC (rev 21711)
@@ -1062,10 +1062,9 @@
 
 						uint32 color = simple_vec(image_data, x + imod, bitmap.bit_count);
 
-						// FIXME?: This works only with b/w cursors and white index may be
-						// different. But now it's enough.
+						// We set up cursor palette for default cursor, so use it
 						if (color) {
-							cursor[0][width * d + x] = 15; // white in SCUMM
+							cursor[0][width * d + x] = 254; // white
 						} else {
 							cursor[0][width * d + x] = 255; // transparent
 						}

Modified: scummvm/trunk/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.cpp	2006-04-09 01:59:47 UTC (rev 21710)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp	2006-04-09 03:16:05 UTC (rev 21711)
@@ -23,6 +23,7 @@
 
 #include "common/stdafx.h"
 
+#include "common/system.h"
 #include "scumm/he/intern_he.h"
 #include "scumm/resource.h"
 #include "scumm/scumm.h"
@@ -1523,6 +1524,11 @@
 	getWizImageDim(resId, 0, cw, ch);
 	_vm->setCursorFromBuffer(cursor, cw, ch, cw);
 	_vm->setCursorHotspot(x, y);
+
+	// Since we set up cursor palette for default cursor, disable it now
+	if (_vm->_system->hasFeature(OSystem::kFeatureCursorHasPalette))
+		_vm->_system->disableCursorPalette(true);
+
 	free(cursor);
 }
 


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





More information about the Scummvm-git-logs mailing list