aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/android/gfx.cpp
diff options
context:
space:
mode:
authordhewg2011-03-12 09:15:27 +0100
committerdhewg2011-03-12 09:36:22 +0100
commit99c0d825418de549c42f26532eb444cdfa82e507 (patch)
treead50e163970a94b429de4c1bfa7758d55ed30010 /backends/platform/android/gfx.cpp
parent4afa2c62b979251cb4d8ff7e5a97f5385a6287fe (diff)
downloadscummvm-rg350-99c0d825418de549c42f26532eb444cdfa82e507.tar.gz
scummvm-rg350-99c0d825418de549c42f26532eb444cdfa82e507.tar.bz2
scummvm-rg350-99c0d825418de549c42f26532eb444cdfa82e507.zip
ANDROID: Cleanup paletted textures
Diffstat (limited to 'backends/platform/android/gfx.cpp')
-rw-r--r--backends/platform/android/gfx.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index 327ef06f38..d0fc392681 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -295,7 +295,7 @@ void OSystem_Android::setPalette(const byte *colors, uint start, uint num) {
ENTER("%p, %u, %u", colors, start, num);
#ifdef USE_RGB_COLOR
- assert(_game_texture->getPixelFormat().bytesPerPixel == 1);
+ assert(_game_texture->hasPalette());
#endif
GLTHREADCHECK;
@@ -310,7 +310,7 @@ void OSystem_Android::grabPalette(byte *colors, uint start, uint num) {
ENTER("%p, %u, %u", colors, start, num);
#ifdef USE_RGB_COLOR
- assert(_game_texture->getPixelFormat().bytesPerPixel == 1);
+ assert(_game_texture->hasPalette());
#endif
GLTHREADCHECK;
@@ -664,7 +664,7 @@ void OSystem_Android::setCursorPalette(const byte *colors,
GLTHREADCHECK;
- if (_mouse_texture->getPixelFormat().bytesPerPixel != 1) {
+ if (!_mouse_texture->hasPalette()) {
LOGD("switching to paletted mouse cursor");
_mouse_texture = _mouse_texture_palette;
@@ -682,7 +682,7 @@ void OSystem_Android::disableCursorPalette(bool disable) {
// when disabling the cursor palette, and we're running a clut8 game,
// it expects the game palette to be used for the cursor
- if (disable && _game_texture->getPixelFormat().bytesPerPixel == 1) {
+ if (disable && _game_texture->hasPalette()) {
byte *src = _game_texture->palette();
byte *dst = _mouse_texture_palette->palette();