diff options
author | Paul Gilbert | 2019-01-31 20:50:34 -0800 |
---|---|---|
committer | Paul Gilbert | 2019-01-31 21:54:34 -0800 |
commit | af2b1252d868ea07a45e5f567f8109c339cb63fe (patch) | |
tree | 0e6907671502e2097d4ed90333d0544a359db61e /engines/glk/conf.h | |
parent | 307dd44fba7efb763c611dc45af7535d2b20ca46 (diff) | |
download | scummvm-rg350-af2b1252d868ea07a45e5f567f8109c339cb63fe.tar.gz scummvm-rg350-af2b1252d868ea07a45e5f567f8109c339cb63fe.tar.bz2 scummvm-rg350-af2b1252d868ea07a45e5f567f8109c339cb63fe.zip |
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
Diffstat (limited to 'engines/glk/conf.h')
-rw-r--r-- | engines/glk/conf.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/glk/conf.h b/engines/glk/conf.h index 4b4a013f2b..b12b46ab38 100644 --- a/engines/glk/conf.h +++ b/engines/glk/conf.h @@ -42,7 +42,7 @@ private: /** * Get a color */ - void get(const Common::String &key, byte *color, const byte *defaultColor = nullptr); + void get(const Common::String &key, uint &color, const byte *defaultColor); /** * Get a font name into a font Id @@ -67,7 +67,7 @@ private: /** * Parse a color */ - void parseColor(const Common::String &str, byte *color); + uint parseColor(const Common::String &str); public: MonoFontInfo _monoInfo; PropFontInfo _propInfo; @@ -79,11 +79,11 @@ public: int _wBorderX, _wBorderY; int _tMarginX, _tMarginY; double _gamma; - byte _borderColor[3], _borderSave[3]; - byte _windowColor[3], _windowSave[3]; + uint _borderColor, _borderSave; + uint _windowColor, _windowSave; int _lcd; int _scrollWidth; - byte _scrollBg[3], _scrollFg[3]; + uint _scrollBg, _scrollFg; bool _graphics; bool _sound; bool _speak; |