[Scummvm-cvs-logs] scummvm master -> 91165bd84135bb3ecd5476d9a2d89b06cca527ef

[lordhoto]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4ca33e2648 WII: Fix color key handling for 16bit mouse cursors.
91165bd841 Merge pull request #452 from lordhoto/wii-16bit-cursor


Commit: 4ca33e264802ec4c679c8b129ca461bb1e9c7f8d
    https://github.com/scummvm/scummvm/commit/4ca33e264802ec4c679c8b129ca461bb1e9c7f8d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-03-26T00:39:27+01:00

Commit Message:
WII: Fix color key handling for 16bit mouse cursors.

This should fix bug #6108 "WII: Zak FM-TOWNS mouse cursor encased in blue box".

Changed paths:
    backends/platform/wii/osystem_gfx.cpp



diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 001cfea..bb91242 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -717,8 +717,8 @@ void OSystem_Wii::setMouseCursor(const void *buf, uint w, uint h, int hotspotX,
 			u16 *d = (u16 *) tmp;
 			for (u16 y = 0; y < h; ++y) {
 				for (u16 x = 0; x < w; ++x) {
-					if (*s++ != _mouseKeyColor)
-						*d++ |= 7 << 12;
+					if (*s++ == _mouseKeyColor)
+						*d++ &= ~(7 << 12);
 					else
 						d++;
 				}


Commit: 91165bd84135bb3ecd5476d9a2d89b06cca527ef
    https://github.com/scummvm/scummvm/commit/91165bd84135bb3ecd5476d9a2d89b06cca527ef
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2014-03-27T00:50:58+01:00

Commit Message:
Merge pull request #452 from lordhoto/wii-16bit-cursor

WII: Fix color key handling for 16bit mouse cursors.

Changed paths:
    backends/platform/wii/osystem_gfx.cpp