COMMON: OSystem now has a PaletteManager

svn-id: r55806

3 files changed, 8 insertions, 4 deletions

diff --git a/backends/platform/psp/default_display_client.h b/backends/platform/psp/default_display_client.h
index 2e33632eb1..c7189b0168 100644
--- a/backends/platform/psp/default_display_client.h
+++ b/backends/platform/psp/default_display_client.h
@@ -69,7 +69,7 @@ protected:
 class Overlay : public DefaultDisplayClient {
 public:
 	Overlay() {}
-	~Overlay() { }
+	~Overlay() {}
 
 	void init();
 	bool allocate();
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index 025edeb684..73a030f5d1 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -273,11 +273,11 @@ void OSystem_PSP::copyRectToOverlay(const OverlayColor *buf, int pitch, int x, i
 }
 
 int16 OSystem_PSP::getOverlayWidth() {
-	return (int16) _overlay.getWidth();
+	return (int16)_overlay.getWidth();
 }
 
 int16 OSystem_PSP::getOverlayHeight() {
-	return (int16) _overlay.getHeight();
+	return (int16)_overlay.getHeight();
 }
 
 void OSystem_PSP::grabPalette(byte *colors, uint start, uint num) {
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index d21c7e78ef..8d274bb5bd 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -44,7 +44,7 @@
 #include "backends/timer/psp/timer.h"
 #include "backends/platform/psp/thread.h"
 
-class OSystem_PSP : public BaseBackend {
+class OSystem_PSP : public BaseBackend, public PaletteManager {
 private:
 
 	Common::SaveFileManager *_savefile;
@@ -94,8 +94,12 @@ public:
 	int16 getHeight();
 
 	// Palette related
+	PaletteManager *getPaletteManager() { return this; }
+protected:
+	// PaletteManager API
 	void setPalette(const byte *colors, uint start, uint num);
 	void grabPalette(byte *colors, uint start, uint num);
+public:
 	void setCursorPalette(const byte *colors, uint start, uint num);
 	void disableCursorPalette(bool disable);