From af2b1252d868ea07a45e5f567f8109c339cb63fe Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 31 Jan 2019 20:50:34 -0800 Subject: GLK: Change use of RGB tuplets to uint This has several advantages, such as simplifying copying and comparing colors. It will also make it easier to specify zcolor_Transparent as a color --- engines/glk/screen.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'engines/glk/screen.h') diff --git a/engines/glk/screen.h b/engines/glk/screen.h index 85c99ea75d..f697b55e1e 100644 --- a/engines/glk/screen.h +++ b/engines/glk/screen.h @@ -83,34 +83,34 @@ public: void initialize(); /** - * Fills the screen with a given rgb color + * Fills the screen with a given color */ - void fill(const byte *rgb); + void fill(uint color); /** - * Fill a given area of the screen with an rgb color + * Fill a given area of the screen with a given color */ - void fillRect(const Rect &box, const byte *rgb); + void fillRect(const Rect &box, uint color); /** * Draws a string using the specified font at the given co-ordinates * @param pos Position for the bottom-left corner the text will be drawn with * @param fontIdx Which font to use - * @param rgb RGB tuplet specifying the text color + * @param color Text color * @param text The text to draw * @param spw ?? */ - int drawString(const Point &pos, int fontIdx, const byte *rgb, const Common::String &text, int spw = 0); + int drawString(const Point &pos, int fontIdx, uint color, const Common::String &text, int spw = 0); /** * Draws a unicode string using the specified font at the given co-ordinates * @param pos Position for the bottom-left corner the text will be drawn with * @param fontIdx Which font to use - * @param rgb RGB tuplet specifying the text color + * @param color Text color * @param text The text to draw * @param spw ?? */ - int drawStringUni(const Point &pos, int fontIdx, const byte *rgb, const Common::U32String &text, int spw = 0); + int drawStringUni(const Point &pos, int fontIdx, uint color, const Common::U32String &text, int spw = 0); /** * Get the width in pixels of a string -- cgit v1.2.3