libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 17:46:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLK: Change Attributes fields from uint to bool

Browse Source
This commit is contained in:
Paul Gilbert 2019-03-09 20:29:20 -08:00
parent e45dd70654
commit 537e9af4e0
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/glk/streams.cpp
View File

@ -242,7 +242,7 @@ void WindowStream::setZColors(uint fg, uint bg) {
PropFontInfo *info = &g_conf->_propInfo; PropFontInfo *info = &g_conf->_propInfo;
if (fg == zcolor_Default) { if (fg == zcolor_Default) {
_window->_attr.fgset = 0; _window->_attr.fgset = false;
_window->_attr.fgcolor = 0; _window->_attr.fgcolor = 0;
Windows::_overrideFgSet = false; Windows::_overrideFgSet = false;
Windows::_overrideFgVal = 0; Windows::_overrideFgVal = 0;
@ -251,7 +251,7 @@ void WindowStream::setZColors(uint fg, uint bg) {
info->_caretColor = info->_caretSave; info->_caretColor = info->_caretSave;
info->_linkColor = info->_linkSave; info->_linkColor = info->_linkSave;
} else if (fg != zcolor_Current) { } else if (fg != zcolor_Current) {
_window->_attr.fgset = 1; _window->_attr.fgset = true;
_window->_attr.fgcolor = fg; _window->_attr.fgcolor = fg;
Windows::_overrideFgSet = true; Windows::_overrideFgSet = true;
Windows::_overrideFgVal = fg; Windows::_overrideFgVal = fg;
@ -264,7 +264,7 @@ void WindowStream::setZColors(uint fg, uint bg) {
if (/*bg != zcolor_Transparent &&*/ bg != zcolor_Cursor) { if (/*bg != zcolor_Transparent &&*/ bg != zcolor_Cursor) {
if (bg == zcolor_Default) { if (bg == zcolor_Default) {
_window->_attr.bgset = 0; _window->_attr.bgset = false;
_window->_attr.bgcolor = 0; _window->_attr.bgcolor = 0;
Windows::_overrideBgSet = false; Windows::_overrideBgSet = false;
Windows::_overrideBgVal = 0; Windows::_overrideBgVal = 0;
@ -272,7 +272,7 @@ void WindowStream::setZColors(uint fg, uint bg) {
g_conf->_windowColor = g_conf->_windowSave; g_conf->_windowColor = g_conf->_windowSave;
g_conf->_borderColor = g_conf->_borderSave; g_conf->_borderColor = g_conf->_borderSave;
} else if (bg != zcolor_Current) { } else if (bg != zcolor_Current) {
_window->_attr.bgset = 1; _window->_attr.bgset = true;
_window->_attr.bgcolor = bg; _window->_attr.bgcolor = bg;
Windows::_overrideBgSet = true; Windows::_overrideBgSet = true;
Windows::_overrideBgVal = bg; Windows::_overrideBgVal = bg;

10
engines/glk/windows.cpp
View File

@ -506,9 +506,9 @@ Window::Window(Windows *windows, uint rock) : _windows(windows), _rock(rock),
_lineRequest(0), _lineRequestUni(0), _charRequest(0), _charRequestUni(0), _lineRequest(0), _lineRequestUni(0), _charRequest(0), _charRequestUni(0),
_mouseRequest(0), _hyperRequest(0), _moreRequest(0), _scrollRequest(0), _imageLoaded(0), _mouseRequest(0), _hyperRequest(0), _moreRequest(0), _scrollRequest(0), _imageLoaded(0),
_echoLineInputBase(true), _lineTerminatorsBase(nullptr), _termCt(0), _echoStream(nullptr) { _echoLineInputBase(true), _lineTerminatorsBase(nullptr), _termCt(0), _echoStream(nullptr) {
_attr.fgset = 0; _attr.fgset = false;
_attr.bgset = 0; _attr.bgset = false;
_attr.reverse = 0; _attr.reverse = false;
_attr.style = 0; _attr.style = 0;
_attr.fgcolor = 0; _attr.fgcolor = 0;
_attr.bgcolor = 0; _attr.bgcolor = 0;
@ -733,8 +733,8 @@ WindowStyle::WindowStyle(const WindowStyleStatic &src) : font(src.font), reverse
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
void Attributes::clear() { void Attributes::clear() {
fgset = 0; fgset = false;
bgset = 0; bgset = false;
fgcolor = 0; fgcolor = 0;
bgcolor = 0; bgcolor = 0;
reverse = false; reverse = false;

10
engines/glk/windows.h
View File

@ -316,11 +316,11 @@ struct WindowStyle {
* Window attributes * Window attributes
*/ */
struct Attributes { struct Attributes {
unsigned fgset : 1; bool fgset : 1;
unsigned bgset : 1; bool bgset : 1;
unsigned reverse : 1; bool reverse : 1;
unsigned : 1; unsigned : 1;
unsigned style : 4; unsigned style : 4;
uint fgcolor; uint fgcolor;
uint bgcolor; uint bgcolor;
uint hyper; uint hyper;