diff options
| author | Matthew Hoops | 2010-08-14 04:03:36 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-08-14 04:03:36 +0000 |
| commit | d882661aecbe8dc27979f15fadfc83882fe58a8d (patch) | |
| tree | dc1074bb24174dc7c169c55874c886edb627eeed | |
| parent | c58e2707ffa147f099e3eaf32c941da9cdc47dda (diff) | |
| download | scummvm-rg350-d882661aecbe8dc27979f15fadfc83882fe58a8d.tar.gz scummvm-rg350-d882661aecbe8dc27979f15fadfc83882fe58a8d.tar.bz2 scummvm-rg350-d882661aecbe8dc27979f15fadfc83882fe58a8d.zip | |
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
| -rw-r--r-- | common/macresman.cpp | 1 | ||||
| -rw-r--r-- | common/macresman.h | 2 |
2 files changed, 2 insertions, 1 deletions
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); /** |