[Scummvm-git-logs] scummvm master -> 4a4e708e6542f1e0de4f3011a7294c207e099952

[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:
4a4e708e65 GLK: Fix loading font colors for gStyles


Commit: 4a4e708e6542f1e0de4f3011a7294c207e099952
    https://github.com/scummvm/scummvm/commit/4a4e708e6542f1e0de4f3011a7294c207e099952
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-05-27T18:32:49-07:00

Commit Message:
GLK: Fix loading font colors for gStyles

Changed paths:
    engines/glk/conf.cpp


diff --git a/engines/glk/conf.cpp b/engines/glk/conf.cpp
index 666d35a7b8f..6ee0505f2c5 100644
--- a/engines/glk/conf.cpp
+++ b/engines/glk/conf.cpp
@@ -216,21 +216,21 @@ void Conf::synchronize() {
 
 	const char *const TG_COLOR[2] = { "tcolor_%d", "gcolor_%d" };
 	for (int tg = 0; tg < 2; ++tg) {
+		WindowStyle *pStyles = (tg == 0) ? _tStyles : _gStyles;
 		for (int style = 0; style <= 10; ++style) {
 			Common::String key = Common::String::format(TG_COLOR[tg], style);
-
 			if (_isLoading) {
 				if (exists(key)) {
 					Common::String line = ConfMan.get(key);
 					if (line.find(',') == 6) {
-						_tStyles[style].fg = parseColor(Common::String(line.c_str(), 6));
-						_tStyles[style].bg = parseColor(Common::String(line.c_str() + 7));
+						pStyles[style].fg = parseColor(Common::String(line.c_str(), 6));
+						pStyles[style].bg = parseColor(Common::String(line.c_str() + 7));
 					}
 				}
 			} else {
 				Common::String line = Common::String::format("%s,%s",
-					encodeColor(_tStyles[style].fg).c_str(),
-					encodeColor(_tStyles[style].bg).c_str()
+					encodeColor(pStyles[style].fg).c_str(),
+					encodeColor(pStyles[style].bg).c_str()
 				);
 				ConfMan.set(key, line);
 			}
@@ -239,19 +239,16 @@ void Conf::synchronize() {
 
 	const char *const TG_FONT[2] = { "tfont_%d", "gfont_%d" };
 	for (int tg = 0; tg < 2; ++tg) {
+		WindowStyle *pStyles = (tg == 0) ? _tStyles : _gStyles;
 		for (int style = 0; style <= 10; ++style) {
 			Common::String key = Common::String::format(TG_FONT[tg], style);
-
 			if (_isLoading) {
 				if (exists(key)) {
 					FACES font = Screen::getFontId(ConfMan.get(key));
-					if (tg == 0)
-						_tStyles[style].font = font;
-					else
-						_gStyles[style].font = font;
+					pStyles[style].font = font;
 				}
 			} else {
-				FACES font = (tg == 0) ? _tStyles[style].font : _gStyles[style].font;
+				FACES font = pStyles[style].font;
 				ConfMan.set(key, Screen::getFontName(font));
 			}
 		}