From 2a3e6c49bf6d664d7c91dd17e41e97f042f70206 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 18 Nov 2018 11:51:42 -0800
Subject: GLK: FROTZ: Set up default Frotz white on blue screen colors

---
 engines/glk/frotz/config.cpp | 30 ++----------------------------
 engines/glk/frotz/config.h   |  2 ++
 engines/glk/frotz/frotz.cpp  |  3 +++
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/engines/glk/frotz/config.cpp b/engines/glk/frotz/config.cpp
index 0461e251c5..21cfb03333 100644
--- a/engines/glk/frotz/config.cpp
+++ b/engines/glk/frotz/config.cpp
@@ -161,36 +161,10 @@ UserOptions::UserOptions() : _undo_slots(MAX_UNDO_SLOTS), _sound(true) {
 	_attribute_testing = getConfigBool("attribute_testing");
 	_object_locating = getConfigBool("object_locating");
 	_object_movement = getConfigBool("object_movement");
-}
 
-#ifdef REMOVE_ME
-if (ConfMan.hasKey("attribute_assignment") && ConfMan.getBool("attribute_assignment"))
-_attribute_assignment = true;
-if (ConfMan.hasKey("attribute_testing") && ConfMan.getBool("attribute_testing"))
-_attribute_testing = true;
-if (ConfMan.hasKey("object_movement") && ConfMan.getBool("object_movement"))
-_object_movement = true;
-if (ConfMan.hasKey("object_locating") && ConfMan.getBool("object_locating"))
-_object_locating = true;
-if (ConfMan.hasKey("piracy") && ConfMan.getBool("piracy"))
-_piracy = true;
-if (ConfMan.hasKey("random_seed"))
-_random.setSeed(ConfMan.getInt("random_seed"));
-if (ConfMan.hasKey("script_cols"))
-_script_cols = ConfMan.getInt("script_cols");
-if (ConfMan.hasKey("tandy_bit") && ConfMan.getBool("tandy_bit"))
-_user_tandy_bit = true;
-if (ConfMan.hasKey("undo_slots"))
-_undo_slots = ConfMan.getInt("undo_slots");
-if (ConfMan.hasKey("expand_abbreviations") && ConfMan.getBool("expand_abbreviations"))
-_expand_abbreviations = true;
-if (ConfMan.hasKey("err_report_mode")) {
-	_err_report_mode = ConfMan.getInt("err_report_mode");
-	if ((_err_report_mode < ERR_REPORT_NEVER) || (_err_report_mode > ERR_REPORT_FATAL))
-		_err_report_mode = ERR_DEFAULT_REPORT_MODE;
+	_defaultForeground = getConfigInt("foreground", 0xffffff, 0xffffff);
+	_defaultBackground = getConfigInt("background", 0x000080, 0xffffff);
 }
 
-#endif
-
 } // End of namespace Scott
 } // End of namespace Glk
diff --git a/engines/glk/frotz/config.h b/engines/glk/frotz/config.h
index a210ba29a0..17e787de3b 100644
--- a/engines/glk/frotz/config.h
+++ b/engines/glk/frotz/config.h
@@ -148,6 +148,8 @@ struct UserOptions {
 	int _undo_slots;
 	int _script_cols;
 	int _err_report_mode;
+	uint _defaultForeground;
+	uint _defaultBackground;
 
 	/**
 	 * Constructor
diff --git a/engines/glk/frotz/frotz.cpp b/engines/glk/frotz/frotz.cpp
index 58287900d9..6b79cfa060 100644
--- a/engines/glk/frotz/frotz.cpp
+++ b/engines/glk/frotz/frotz.cpp
@@ -50,6 +50,9 @@ void Frotz::initialize() {
 	// Call process initialization
 	Processor::initialize();
 
+	// Set the screen colors
+	garglk_set_zcolors(_defaultForeground, _defaultBackground);
+
 	// Restart the game
 	z_restart();
 }
-- 
cgit v1.2.3