aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/android
diff options
context:
space:
mode:
authorMax Horn2011-02-07 17:52:38 +0000
committerMax Horn2011-02-07 17:52:38 +0000
commitab039812e7d0a0202317c61a2cb64874e4d0c410 (patch)
treec3069b36ba6e18068fa343416acf485e2d0728e4 /backends/platform/android
parent8981fa3f164aa8f397df2af8b85d6edfa4bdd883 (diff)
downloadscummvm-rg350-ab039812e7d0a0202317c61a2cb64874e4d0c410.tar.gz
scummvm-rg350-ab039812e7d0a0202317c61a2cb64874e4d0c410.tar.bz2
scummvm-rg350-ab039812e7d0a0202317c61a2cb64874e4d0c410.zip
COMMON: OSystem now has a PaletteManager
svn-id: r55806
Diffstat (limited to 'backends/platform/android')
-rw-r--r--backends/platform/android/android.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 7a4ae24e6b..b790dab036 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -153,7 +153,7 @@ static void checkGlError(const char* file, int line) {
#define CHECK_GL_ERROR() do {} while (false)
#endif
-class OSystem_Android : public BaseBackend {
+class OSystem_Android : public BaseBackend, public PaletteManager {
private:
jobject _back_ptr; // back pointer to (java) peer instance
jmethodID MID_displayMessageOnOSD;
@@ -238,8 +238,14 @@ public:
virtual int getScreenChangeID() const { return _screen_changeid; }
virtual int16 getHeight();
virtual int16 getWidth();
+
+ virtual PaletteManager *getPaletteManager() { return this; }
+protected:
+ // PaletteManager API
virtual void setPalette(const byte *colors, uint start, uint num);
virtual void grabPalette(byte *colors, uint start, uint num);
+
+public:
virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
virtual void updateScreen();
virtual Graphics::Surface *lockScreen();