From a2c02367f7fe76a6a76fbd872908274f679e4b4d Mon Sep 17 00:00:00 2001 From: dhewg Date: Sat, 5 Mar 2011 19:39:46 +0100 Subject: ANDROID: Rename function for less confusion --- backends/platform/android/android.h | 2 +- backends/platform/android/gfx.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index 2c0641f789..6eb43a390e 100644 --- a/backends/platform/android/android.h +++ b/backends/platform/android/android.h @@ -153,7 +153,7 @@ private: #endif void setupKeymapper(); - void _setCursorPalette(const byte *colors, uint start, uint num); + void setCursorPaletteInternal(const byte *colors, uint start, uint num); public: OSystem_Android(int audio_sample_rate, int audio_buffer_size); diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp index d6dc71fcfb..12262f851b 100644 --- a/backends/platform/android/gfx.cpp +++ b/backends/platform/android/gfx.cpp @@ -298,7 +298,7 @@ void OSystem_Android::setPalette(const byte *colors, uint start, uint num) { colors, num * 3); if (!_use_mouse_palette) - _setCursorPalette(colors, start, num); + setCursorPaletteInternal(colors, start, num); } void OSystem_Android::grabPalette(byte *colors, uint start, uint num) { @@ -618,8 +618,8 @@ void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h, _mouse_targetscale = cursorTargetScale; } -void OSystem_Android::_setCursorPalette(const byte *colors, - uint start, uint num) { +void OSystem_Android::setCursorPaletteInternal(const byte *colors, + uint start, uint num) { byte *palette = _mouse_texture_palette->palette() + start * 4; for (uint i = 0; i < num; ++i, palette += 4, colors += 3) { @@ -645,7 +645,7 @@ void OSystem_Android::setCursorPalette(const byte *colors, _mouse_texture_rgb = 0; } - _setCursorPalette(colors, start, num); + setCursorPaletteInternal(colors, start, num); _use_mouse_palette = true; } -- cgit v1.2.3