diff options
| author | Max Horn | 2008-11-06 14:27:13 +0000 |
|---|---|---|
| committer | Max Horn | 2008-11-06 14:27:13 +0000 |
| commit | f238a12b27ebfa9847814b9972fdb5789e484533 (patch) | |
| tree | fe14180f721904c41ec9f958198338b3ca55ef68 /backends/platform/dc | |
| parent | 38a4eaa001f89fa201125fbe1b82f6f539ecda12 (diff) | |
| download | scummvm-rg350-f238a12b27ebfa9847814b9972fdb5789e484533.tar.gz scummvm-rg350-f238a12b27ebfa9847814b9972fdb5789e484533.tar.bz2 scummvm-rg350-f238a12b27ebfa9847814b9972fdb5789e484533.zip | |
Got rid of OSystem::ARGBToColor and colorToARGB
svn-id: r34911
Diffstat (limited to 'backends/platform/dc')
| -rw-r--r-- | backends/platform/dc/dc.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h index 54cd2e982b..8b99457310 100644 --- a/backends/platform/dc/dc.h +++ b/backends/platform/dc/dc.h @@ -155,15 +155,8 @@ class OSystem_Dreamcast : public OSystem, public FilesystemFactory { void clearOverlay(); void grabOverlay(int16 *buf, int pitch); void copyRectToOverlay(const int16 *buf, int pitch, int x, int y, int w, int h); - OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b) { return ARGBToColor(255, r, g, b); } + OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b) { return (0xf000|((r&0xf0)<<4)|(g&0xf0)|(b>>4); } void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) { - uint8 tmp; colorToARGB(color, tmp, r, g, b); - } - OverlayColor ARGBToColor(uint8 a, uint8 r, uint8 g, uint8 b) { - return ((a&0xf0)<<8)|((r&0xf0)<<4)|(g&0xf0)|(b>>4); - } - void colorToARGB(OverlayColor color, uint8 &a, uint8 &r, uint8 &g, uint8 &b) { - a = ((color>>8)&0xf0)|((color>>12)&0x0f); r = ((color>>4)&0xf0)|((color>>8)&0x0f); g = (color&0xf0)|((color>>4)&0x0f); b = ((color<<4)&0xf0)|(color&0x0f); |