[Scummvm-git-logs] scummvm master -> 9841fe4d200eb03e91cad6afe38c7706e71a0e3e

[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:
9841fe4d20 GLK: Fix initialization of text colors


Commit: 9841fe4d200eb03e91cad6afe38c7706e71a0e3e
    https://github.com/scummvm/scummvm/commit/9841fe4d200eb03e91cad6afe38c7706e71a0e3e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-28T21:01:28-07:00

Commit Message:
GLK: Fix initialization of text colors

Changed paths:
    engines/glk/conf.cpp
    engines/glk/glk.cpp


diff --git a/engines/glk/conf.cpp b/engines/glk/conf.cpp
index 2c63cbf94a..fea0b3dbad 100644
--- a/engines/glk/conf.cpp
+++ b/engines/glk/conf.cpp
@@ -107,8 +107,12 @@ Conf::Conf(InterpreterType interpType) : _interpType(interpType), _graphics(true
 	if (_screenFormat.bytesPerPixel == 1)
 		_graphics = false;
 
-	Common::copy(T_STYLES, T_STYLES + style_NUMSTYLES, _tStyles);
-	Common::copy(G_STYLES, G_STYLES + style_NUMSTYLES, _gStyles);
+	for (int i = 0; i < style_NUMSTYLES; ++i) {
+		_tStyles[i].fg = parseColor(T_STYLES[i].fg);
+		_tStyles[i].bg = parseColor(T_STYLES[i].bg);
+		_gStyles[i].fg = parseColor(G_STYLES[i].fg);
+		_gStyles[i].bg = parseColor(G_STYLES[i].bg);
+	}
 
 	Common::copy(_tStyles, _tStyles + style_NUMSTYLES, _tStylesDefault);
 	Common::copy(_gStyles, _gStyles + style_NUMSTYLES, _gStylesDefault);
diff --git a/engines/glk/glk.cpp b/engines/glk/glk.cpp
index 60a9753c32..48043b9a62 100644
--- a/engines/glk/glk.cpp
+++ b/engines/glk/glk.cpp
@@ -83,7 +83,7 @@ GlkEngine::~GlkEngine() {
 void GlkEngine::initialize() {
 	createConfiguration();
 	_conf->load();
-	_conf->flush();
+	//_conf->flush();
 
 	initGraphicsMode();
 	createDebugger();