diff options
| author | Johannes Schickel | 2011-02-19 21:42:34 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-02-19 21:46:45 +0100 |
| commit | e21d6e0d1120e917a4a019a4070ec4db5e988b9b (patch) | |
| tree | 1142828b72ccf17d513c621e108d749f148fd32b /common | |
| parent | 32d0e4c15fb33f80db194087850466664a43516a (diff) | |
| parent | b26f30b98793c522265a3eeb48fb3b41034663c6 (diff) | |
| download | scummvm-rg350-e21d6e0d1120e917a4a019a4070ec4db5e988b9b.tar.gz scummvm-rg350-e21d6e0d1120e917a4a019a4070ec4db5e988b9b.tar.bz2 scummvm-rg350-e21d6e0d1120e917a4a019a4070ec4db5e988b9b.zip | |
Merge branch 'osystem-palette' of https://github.com/lordhoto/scummvm into master
Conflicts:
backends/platform/android/android.cpp
engines/sci/graphics/screen.cpp
engines/sci/graphics/transitions.cpp
Diffstat (limited to 'common')
| -rw-r--r-- | common/macresman.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/common/macresman.cpp b/common/macresman.cpp index 9a50549a9d..4fd4e72ee3 100644 --- a/common/macresman.cpp +++ b/common/macresman.cpp @@ -638,23 +638,21 @@ void MacResManager::convertCrsrCursor(byte *data, int datasize, byte **cursor, i dis.readUint16BE(); // ctFlag ctSize = dis.readUint16BE() + 1; - *palette = (byte *)malloc(ctSize * 4); + *palette = (byte *)malloc(ctSize * 3); // Read just high byte of 16-bit color for (int c = 0; c < ctSize; c++) { // We just use indices 0..ctSize, so ignore color ID dis.readUint16BE(); // colorID[c] - palette[0][c * 4 + 0] = dis.readByte(); + palette[0][c * 3 + 0] = dis.readByte(); dis.readByte(); - palette[0][c * 4 + 1] = dis.readByte(); + palette[0][c * 3 + 1] = dis.readByte(); dis.readByte(); - palette[0][c * 4 + 2] = dis.readByte(); + palette[0][c * 3 + 2] = dis.readByte(); dis.readByte(); - - palette[0][c * 4 + 3] = 0; } *palSize = ctSize; |