From 307dd44fba7efb763c611dc45af7535d2b20ca46 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 31 Jan 2019 19:01:22 -0800
Subject: GLK: FROTZ: Cleanup of current fg/bg variables

---
 engines/glk/frotz/glk_interface.cpp    | 12 ++++++------
 engines/glk/frotz/glk_interface.h      |  3 +--
 engines/glk/frotz/processor_screen.cpp |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp
index 9c0b8feb51..e8a285a574 100644
--- a/engines/glk/frotz/glk_interface.cpp
+++ b/engines/glk/frotz/glk_interface.cpp
@@ -33,12 +33,12 @@ namespace Frotz {
 
 GlkInterface::GlkInterface(OSystem *syst, const GlkGameDescription &gameDesc) :
 		GlkAPI(syst, gameDesc),
-		_pics(nullptr), oldstyle(0), curstyle(0), cury(1), curx(1), fixforced(0), curr_fg(-2), curr_bg(-2),
-		curr_font(1), prev_font(1), temp_font(0), curr_status_ht(0), mach_status_ht(0), gos_status(nullptr),
-		gos_curwin(nullptr), gos_linepending(0), gos_linebuf(nullptr), gos_linewin(nullptr),
-		gos_channel(nullptr), cwin(0), mwin(0), mouse_x(0), mouse_y(0), menu_selected(0), enable_wrapping(false),
-		enable_scripting(false), enable_scrolling(false), enable_buffering(false), next_sample(0), next_volume(0),
-		_soundLocked(false), _soundPlaying(false) {
+		_pics(nullptr), oldstyle(0), curstyle(0), cury(1), curx(1), fixforced(0),
+		curr_fg(zcolor_Current), curr_bg(zcolor_Current), curr_font(1), prev_font(1), temp_font(0),
+		curr_status_ht(0), mach_status_ht(0), gos_status(nullptr), gos_curwin(nullptr), gos_linepending(0),
+		gos_linebuf(nullptr), gos_linewin(nullptr), gos_channel(nullptr), cwin(0), mwin(0), mouse_x(0), mouse_y(0),
+		menu_selected(0), enable_wrapping(false), enable_scripting(false), enable_scrolling(false),
+		enable_buffering(false), next_sample(0), next_volume(0), _soundLocked(false), _soundPlaying(false) {
 	Common::fill(&statusline[0], &statusline[256], '\0');
 }
 
diff --git a/engines/glk/frotz/glk_interface.h b/engines/glk/frotz/glk_interface.h
index d3808013a4..178b53339d 100644
--- a/engines/glk/frotz/glk_interface.h
+++ b/engines/glk/frotz/glk_interface.h
@@ -59,8 +59,7 @@ public:
 	int curx;
 	int fixforced;
 
-	int curr_fg;
-	int curr_bg;
+	uint curr_fg, curr_bg;
 	int curr_font;
 	int prev_font;
 	int temp_font;
diff --git a/engines/glk/frotz/processor_screen.cpp b/engines/glk/frotz/processor_screen.cpp
index 211dc896a5..95e1218f01 100644
--- a/engines/glk/frotz/processor_screen.cpp
+++ b/engines/glk/frotz/processor_screen.cpp
@@ -290,8 +290,8 @@ void Processor::z_set_true_colour() {
 	garglk_set_zcolors(zfore, zback);
 #endif /* GARGLK */
 
-	curr_fg = zfore;
-	curr_bg = zback;
+	curr_fg = (uint)zfore;
+	curr_bg = (uint)zback;
 }
 
 static const int zcolor_map[] = {
-- 
cgit v1.2.3