From 5b9e492a727a400786bbc621c706f04b678d8281 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 2 Feb 2019 11:51:09 -0800 Subject: GLK: Fix local types in Attribute color methods --- engines/glk/windows.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'engines') 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; -- cgit v1.2.3