diff options
| author | Paul Gilbert | 2019-02-02 11:51:09 -0800 |
|---|---|---|
| committer | Paul Gilbert | 2019-02-05 21:01:36 -0800 |
| commit | 5b9e492a727a400786bbc621c706f04b678d8281 (patch) | |
| tree | 098f36fd71af54ddbf23b149405aaaa6e3cf6ad5 /engines | |
| parent | 49c5069324e1c45a399f4dcf2a32ce53be840377 (diff) | |
| download | scummvm-rg350-5b9e492a727a400786bbc621c706f04b678d8281.tar.gz scummvm-rg350-5b9e492a727a400786bbc621c706f04b678d8281.tar.bz2 scummvm-rg350-5b9e492a727a400786bbc621c706f04b678d8281.zip | |
GLK: Fix local types in Attribute color methods
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/glk/windows.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/glk/windows.cpp b/engines/glk/windows.cpp index 020b68f66d..74cf2751ef 100644 --- a/engines/glk/windows.cpp +++ b/engines/glk/windows.cpp @@ -749,11 +749,11 @@ void Attributes::clear() { uint Attributes::attrBg(const WindowStyle *styles) { int revset = reverse || (styles[style].reverse && !Windows::_overrideReverse); - int zfset = fgset ? fgset : Windows::_overrideFgSet; - int zbset = bgset ? bgset : Windows::_overrideBgSet; + bool zfset = fgset ? fgset : Windows::_overrideFgSet; + bool zbset = bgset ? bgset : Windows::_overrideBgSet; - int zfore = fgset ? fgcolor : Windows::_overrideFgVal; - int zback = bgset ? bgcolor : Windows::_overrideBgVal; + uint zfore = fgset ? fgcolor : Windows::_overrideFgVal; + uint zback = bgset ? bgcolor : Windows::_overrideBgVal; if (zfset && zfore != Windows::_zcolor_fg) { Windows::_zcolor_Foreground = zfore; @@ -786,11 +786,11 @@ uint Attributes::attrBg(const WindowStyle *styles) { uint Attributes::attrFg(const WindowStyle *styles) { int revset = reverse || (styles[style].reverse && !Windows::_overrideReverse); - int zfset = fgset ? fgset : Windows::_overrideFgSet; - int zbset = bgset ? bgset : Windows::_overrideBgSet; + bool zfset = fgset ? fgset : Windows::_overrideFgSet; + bool zbset = bgset ? bgset : Windows::_overrideBgSet; - int zfore = fgset ? fgcolor : Windows::_overrideFgVal; - int zback = bgset ? bgcolor : Windows::_overrideBgVal; + uint zfore = fgset ? fgcolor : Windows::_overrideFgVal; + uint zback = bgset ? bgcolor : Windows::_overrideBgVal; if (zfset && zfore != Windows::_zcolor_fg) { Windows::_zcolor_Foreground = zfore; |