diff options
| author | Chris Apers | 2003-05-02 09:23:56 +0000 |
|---|---|---|
| committer | Chris Apers | 2003-05-02 09:23:56 +0000 |
| commit | e76b56aa6f7d690e8df7aa9757f6803ee8c6d1e1 (patch) | |
| tree | 95887f79cbc458fb38f13d25058622f7cac88923 | |
| parent | 82e3011ec5555b6820bef41dd2652fdbb5ade751 (diff) | |
| download | scummvm-rg350-e76b56aa6f7d690e8df7aa9757f6803ee8c6d1e1.tar.gz scummvm-rg350-e76b56aa6f7d690e8df7aa9757f6803ee8c6d1e1.tar.bz2 scummvm-rg350-e76b56aa6f7d690e8df7aa9757f6803ee8c6d1e1.zip | |
Change int16 to NewGuiColor in overlay/RGB functions
svn-id: r7259
| -rw-r--r-- | common/system.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/system.h b/common/system.h index 40e029df81..f18d72a5ef 100644 --- a/common/system.h +++ b/common/system.h @@ -171,8 +171,8 @@ public: virtual void show_overlay() = 0; virtual void hide_overlay() = 0; virtual void clear_overlay() = 0; - virtual void grab_overlay(int16 *buf, int pitch) = 0; - virtual void copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h) = 0; + virtual void grab_overlay(NewGuiColor *buf, int pitch) = 0; + virtual void copy_rect_overlay(const NewGuiColor *buf, int pitch, int x, int y, int w, int h) = 0; // Low-level graphics access virtual int16 get_height() {return 200;} @@ -180,10 +180,10 @@ public: // Methods that convert RGB to/from colors suitable for the overlay. // Default implementation assumes 565 mode. - virtual int16 RGBToColor(uint8 r, uint8 g, uint8 b) { + virtual NewGuiColor RGBToColor(uint8 r, uint8 g, uint8 b) { return ((((r >> 3) & 0x1F) << 11) | (((g >> 2) & 0x3F) << 5) | ((b >> 3) & 0x1F)); } - virtual void colorToRGB(int16 color, uint8 &r, uint8 &g, uint8 &b) { + virtual void colorToRGB(NewGuiColor color, uint8 &r, uint8 &g, uint8 &b) { r = (((color >> 11) & 0x1F) << 3); g = (((color >> 5) & 0x3F) << 2); b = ((color&0x1F) << 3); |