aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhewg2011-03-07 23:41:34 +0100
committerdhewg2011-03-07 23:42:20 +0100
commit905d5e76b463870fba69d6683c96ac93d6fda623 (patch)
tree03e0940d4486edf89fd0bdfac73af1d6afe6d336
parente71fb5b0eb9c9c68bf328d557f09a3191e0c8b8f (diff)
downloadscummvm-rg350-905d5e76b463870fba69d6683c96ac93d6fda623.tar.gz
scummvm-rg350-905d5e76b463870fba69d6683c96ac93d6fda623.tar.bz2
scummvm-rg350-905d5e76b463870fba69d6683c96ac93d6fda623.zip
ANDROID: Move misplaced assert
Leftover from the recently introduced 16bit support
-rw-r--r--backends/platform/android/gfx.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index 6422a28f7b..605f4eb744 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -577,8 +577,6 @@ void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h,
GLTHREADCHECK;
- assert(keycolor < 256);
-
#ifdef USE_RGB_COLOR
if (format && format->bytesPerPixel > 1) {
if (_mouse_texture != _mouse_texture_rgb)
@@ -600,6 +598,8 @@ void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h,
_mouse_texture->allocBuffer(w, h);
if (_mouse_texture == _mouse_texture_palette) {
+ assert(keycolor < 256);
+
// Update palette alpha based on keycolor
byte *palette = _mouse_texture_palette->palette();