diff options
| author | sylvaintv | 2011-03-08 00:54:40 +0100 |
|---|---|---|
| committer | sylvaintv | 2011-03-08 00:54:40 +0100 |
| commit | b2a72da6518b30a58a1257ff7217185ae5683628 (patch) | |
| tree | 41e5d532124466b09a396ec4b043ec74e1b9ea56 /backends/platform/android/android.h | |
| parent | 53d6a4f831c9e7c7de594cdaed3c8546b41ea2e2 (diff) | |
| parent | 9fb28410b5ea27fa8e79ac5f0ac4ce70ae4cf3c6 (diff) | |
| download | scummvm-rg350-b2a72da6518b30a58a1257ff7217185ae5683628.tar.gz scummvm-rg350-b2a72da6518b30a58a1257ff7217185ae5683628.tar.bz2 scummvm-rg350-b2a72da6518b30a58a1257ff7217185ae5683628.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'backends/platform/android/android.h')
| -rw-r--r-- | backends/platform/android/android.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index 2c0641f789..f6406c4132 100644 --- a/backends/platform/android/android.h +++ b/backends/platform/android/android.h @@ -114,7 +114,7 @@ private: // Mouse layer GLESTexture *_mouse_texture; GLESPaletteTexture *_mouse_texture_palette; - GLESTexture *_mouse_texture_rgb; + GLES5551Texture *_mouse_texture_rgb; Common::Point _mouse_hotspot; int _mouse_targetscale; bool _show_mouse; @@ -146,6 +146,8 @@ private: void deinitSurface(); void initViewport(); + void initOverlay(); + #ifdef USE_RGB_COLOR Common::String getPixelFormatName(const Graphics::PixelFormat &format) const; void initTexture(GLESTexture **texture, uint width, uint height, @@ -153,7 +155,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); |