From d882661aecbe8dc27979f15fadfc83882fe58a8d Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sat, 14 Aug 2010 04:03:36 +0000
Subject: COMMON: Cleanup MacResManager::convertCrsrCursor a bit

It's now a static function since it doesn't require any local variables and is really separate from the resource fork code. Also, actually assigning the keycolor (which was just being ignored).

svn-id: r52075
---
 common/macresman.cpp | 1 +
 common/macresman.h   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/macresman.cpp b/common/macresman.cpp
index df7351d55a..eb6a5939b6 100644
--- a/common/macresman.cpp
+++ b/common/macresman.cpp
@@ -557,6 +557,7 @@ void MacResManager::convertCrsrCursor(byte *data, int datasize, byte **cursor, i
 	*hotspot_y = dis.readUint16BE();
 	*hotspot_x = dis.readUint16BE();
 	*w = *h = 16;
+	*keycolor = 0xff;
 
 	// Use b/w cursor on backends which don't support cursor palettes
 	if (!colored)
diff --git a/common/macresman.h b/common/macresman.h
index c067b6d2b8..2168235670 100644
--- a/common/macresman.h
+++ b/common/macresman.h
@@ -94,7 +94,7 @@ public:
 	 *                The memory will be malloc()'ed
 	 * @param palSize Pointer to integer where the palette size will be stored.
 	 */
-	void convertCrsrCursor(byte *data, int datasize, byte **cursor, int *w, int *h,
+	static void convertCrsrCursor(byte *data, int datasize, byte **cursor, int *w, int *h,
 					  int *hotspot_x, int *hotspot_y, int *keycolor, bool colored, byte **palette, int *palSize);
 
 	/**
-- 
cgit v1.2.3