diff options
author | Max Horn | 2008-11-06 15:02:50 +0000 |
---|---|---|
committer | Max Horn | 2008-11-06 15:02:50 +0000 |
commit | edf9f249260b1fd4364f6727fa622991e81e8cf3 (patch) | |
tree | 2b034d5daf7b69212957d8d51ab839974f51f2c5 /backends/platform/ps2 | |
parent | f238a12b27ebfa9847814b9972fdb5789e484533 (diff) | |
download | scummvm-rg350-edf9f249260b1fd4364f6727fa622991e81e8cf3.tar.gz scummvm-rg350-edf9f249260b1fd4364f6727fa622991e81e8cf3.tar.bz2 scummvm-rg350-edf9f249260b1fd4364f6727fa622991e81e8cf3.zip |
Got rid of OSystem::colorToRGB and RGBToColor; added implementations for OSystem::getOverlayFormat to several ports (pending testing by the porters)
svn-id: r34912
Diffstat (limited to 'backends/platform/ps2')
-rw-r--r-- | backends/platform/ps2/systemps2.cpp | 10 | ||||
-rw-r--r-- | backends/platform/ps2/systemps2.h | 4 |
2 files changed, 1 insertions, 13 deletions
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index 85eb303e86..aac399ee23 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -641,16 +641,6 @@ bool OSystem_PS2::pollEvent(Common::Event &event) { return res; } -OverlayColor OSystem_PS2::RGBToColor(uint8 r, uint8 g, uint8 b) { - return (r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10); -} - -void OSystem_PS2::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) { - r = (color & 0x1F) << 3; - g = ((color >> 5) & 0x1F) << 3; - b = ((color >> 10) & 0x1F) << 3; -} - int16 OSystem_PS2::getHeight(void) { return _screen->getHeight(); } diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h index 9539baf4f5..e4ac410caa 100644 --- a/backends/platform/ps2/systemps2.h +++ b/backends/platform/ps2/systemps2.h @@ -110,9 +110,7 @@ public: virtual Common::SeekableReadStream *openConfigFileForReading(); virtual Common::WriteStream *openConfigFileForWriting(); - virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b); - - virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b); + virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<555>(); } virtual Common::SaveFileManager *getSavefileManager(); virtual FilesystemFactory *getFilesystemFactory(); |