thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Cleanup MacResManager::convertCrsrCursor a bit

Browse source 
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
This commit is contained in:
Matthew Hoops 2010-08-14 04:03:36 +00:00
parent c58e2707ff
commit d882661aec
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/macresman.cpp
View file

@ -557,6 +557,7 @@ void MacResManager::convertCrsrCursor(byte *data, int datasize, byte **cursor, i
*hotspot_y = dis.readUint16BE(); *hotspot_y = dis.readUint16BE();
*hotspot_x = dis.readUint16BE(); *hotspot_x = dis.readUint16BE();
*w = *h = 16; *w = *h = 16;
*keycolor = 0xff;
// Use b/w cursor on backends which don't support cursor palettes // Use b/w cursor on backends which don't support cursor palettes
if (!colored) if (!colored)

2
common/macresman.h
View file

@ -94,7 +94,7 @@ public:
* The memory will be malloc()'ed * The memory will be malloc()'ed
* @param palSize Pointer to integer where the palette size will be stored. * @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); int *hotspot_x, int *hotspot_y, int *keycolor, bool colored, byte **palette, int *palSize);
/** /**