[Scummvm-cvs-logs] SF.net SVN: scummvm:[52075] scummvm/trunk/common

[mthreepwood at users.sourceforge.net]

Revision: 52075
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52075&view=rev
Author:   mthreepwood
Date:     2010-08-14 04:03:36 +0000 (Sat, 14 Aug 2010)

Log Message:
-----------
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).

Modified Paths:
--------------
    scummvm/trunk/common/macresman.cpp
    scummvm/trunk/common/macresman.h

Modified: scummvm/trunk/common/macresman.cpp
===================================================================
--- scummvm/trunk/common/macresman.cpp	2010-08-14 00:56:12 UTC (rev 52074)
+++ scummvm/trunk/common/macresman.cpp	2010-08-14 04:03:36 UTC (rev 52075)
@@ -557,6 +557,7 @@
 	*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)

Modified: scummvm/trunk/common/macresman.h
===================================================================
--- scummvm/trunk/common/macresman.h	2010-08-14 00:56:12 UTC (rev 52074)
+++ scummvm/trunk/common/macresman.h	2010-08-14 04:03:36 UTC (rev 52075)
@@ -94,7 +94,7 @@
 	 *                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);
 
 	/**


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