diff options
| author | Alejandro Marzini | 2010-08-16 00:21:07 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-08-16 00:21:07 +0000 |
| commit | b0409d673921163085d2e2fa440911080a7cf884 (patch) | |
| tree | 81b1bb895db6baed7881ca5cbc7ff3a830286189 /common/macresman.cpp | |
| parent | 503578ac1087b91dcb912fd7918454de73538b34 (diff) | |
| parent | b49761b6eae3a0aadefef4c4ffee6a7b583cc3ac (diff) | |
| download | scummvm-rg350-b0409d673921163085d2e2fa440911080a7cf884.tar.gz scummvm-rg350-b0409d673921163085d2e2fa440911080a7cf884.tar.bz2 scummvm-rg350-b0409d673921163085d2e2fa440911080a7cf884.zip | |
Merge trunk, from r51777 to r52105
svn-id: r52108
Diffstat (limited to 'common/macresman.cpp')
| -rw-r--r-- | common/macresman.cpp | 1 |
1 files changed, 1 insertions, 0 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) |