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 /backends/platform/ds/arm9/source/osystem_ds.cpp | |
| 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 'backends/platform/ds/arm9/source/osystem_ds.cpp')
| -rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 55e3be6cca..3ad92b4355 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -204,7 +204,7 @@ void OSystem_DS::setPalette(const byte *colors, uint start, uint num) { } // if (num == 255) consolePrintf("pal:%d r:%d g:%d b:%d\n", r, red, green, blue); - colors += 4; + colors += 3; } } @@ -235,7 +235,7 @@ void OSystem_DS::setCursorPalette(const byte *colors, uint start, uint num) { u16 paletteValue = red | (green << 5) | (blue << 10); _cursorPalette[r] = paletteValue; - colors += 4; + colors += 3; } _disableCursorPalette = false; @@ -266,7 +266,6 @@ void OSystem_DS::grabPalette(unsigned char *colours, uint start, uint num) { *colours++ = (BG_PALETTE[r] & 0x001F) << 3; *colours++ = (BG_PALETTE[r] & 0x03E0) >> 5 << 3; *colours++ = (BG_PALETTE[r] & 0x7C00) >> 10 << 3; - colours++; } } |