From 3b73ceb17eaf57ed9dfdef8503c48a560aaf9f85 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 18 Feb 2014 02:34:27 +0100
Subject: WII: Make GPL headers consistent in themselves.

---
 backends/platform/wii/osystem_gfx.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'backends/platform/wii/osystem_gfx.cpp')

diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 92c890b0a9..001cfea31e 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -8,15 +8,16 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
  */
 
 #define FORBIDDEN_SYMBOL_EXCEPTION_printf
-- 
cgit v1.2.3


From 4ca33e264802ec4c679c8b129ca461bb1e9c7f8d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 26 Mar 2014 00:39:27 +0100
Subject: WII: Fix color key handling for 16bit mouse cursors.

This should fix bug #6108 "WII: Zak FM-TOWNS mouse cursor encased in blue box".
---
 backends/platform/wii/osystem_gfx.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'backends/platform/wii/osystem_gfx.cpp')

diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 001cfea31e..bb91242f98 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++;
 				}
-- 
cgit v1.2.3