[Scummvm-git-logs] scummvm master -> 5b9e492a727a400786bbc621c706f04b678d8281

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5b9e492a72 GLK: Fix local types in Attribute color methods


Commit: 5b9e492a727a400786bbc621c706f04b678d8281
    https://github.com/scummvm/scummvm/commit/5b9e492a727a400786bbc621c706f04b678d8281
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-02-05T21:01:36-08:00

Commit Message:
GLK: Fix local types in Attribute color methods

Changed paths:
    engines/glk/windows.cpp


diff --git a/engines/glk/windows.cpp b/engines/glk/windows.cpp
index 020b68f..74cf275 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;