diff options
author | Jonathan Gray | 2003-03-08 06:53:32 +0000 |
---|---|---|
committer | Jonathan Gray | 2003-03-08 06:53:32 +0000 |
commit | 361e312a6c8f0520b20ae8089f444373bee49890 (patch) | |
tree | ebe669746fe43352c26f07ad46d18083a07c36cd /common | |
parent | e4a8edfc67d77d6b7acc525db24282715deb1744 (diff) | |
download | scummvm-rg350-361e312a6c8f0520b20ae8089f444373bee49890.tar.gz scummvm-rg350-361e312a6c8f0520b20ae8089f444373bee49890.tar.bz2 scummvm-rg350-361e312a6c8f0520b20ae8089f444373bee49890.zip |
change RBG to RGB which follows the argument order and hence makes more sense...
svn-id: r6767
Diffstat (limited to 'common')
-rw-r--r-- | common/system.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/system.h b/common/system.h index dc51d288e3..0eb5a0dce0 100644 --- a/common/system.h +++ b/common/system.h @@ -180,12 +180,12 @@ public: virtual int16 get_height() {return 200;} virtual int16 get_width() {return 320;} - // Methods that convert RBG to/from colors suitable for the overlay. + // Methods that convert RGB to/from colors suitable for the overlay. // Default implementation assumes 565 mode. - virtual int16 RBGToColor(uint8 r, uint8 g, uint8 b) { + virtual int16 RGBToColor(uint8 r, uint8 g, uint8 b) { return ((((r >> 3) & 0x1F) << 11) | (((g >> 2) & 0x3F) << 5) | ((b >> 3) & 0x1F)); } - virtual void colorToRBG(int16 color, uint8 &r, uint8 &g, uint8 &b) { + virtual void colorToRGB(int16 color, uint8 &r, uint8 &g, uint8 &b) { r = (((color >> 11) & 0x1F) << 3); g = (((color >> 5) & 0x3F) << 2); b = ((color&0x1F) << 3); |