[Scummvm-git-logs] scummvm master -> fdeef7930ccec79bc1c5c131ff5c78915d96d912

[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:
fdeef7930c M4: RIDDLE: Fix text color in conversation dialogs


Commit: fdeef7930ccec79bc1c5c131ff5c78915d96d912
    https://github.com/scummvm/scummvm/commit/fdeef7930ccec79bc1c5c131ff5c78915d96d912
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-22T19:50:00-07:00

Commit Message:
M4: RIDDLE: Fix text color in conversation dialogs

Changed paths:
    engines/m4/adv_r/conv_io.cpp
    engines/m4/gui/gui_dialog.cpp


diff --git a/engines/m4/adv_r/conv_io.cpp b/engines/m4/adv_r/conv_io.cpp
index d3b4b181428..3b3ca3f4f13 100644
--- a/engines/m4/adv_r/conv_io.cpp
+++ b/engines/m4/adv_r/conv_io.cpp
@@ -709,6 +709,9 @@ void conv_set_default_hv(int32 h, int32 v) {
 
 void conv_set_default_text_colour(int32 norm_colour, int32 hi_colour) {
 	conv_set_text_colours(norm_colour, norm_colour, norm_colour, hi_colour, hi_colour, hi_colour);
+
+	_GC(conv_default_normal_colour) = norm_colour;
+	_GC(conv_default_hilite_colour) = hi_colour;
 }
 
 void conv_set_shading(int32 shade) {
diff --git a/engines/m4/gui/gui_dialog.cpp b/engines/m4/gui/gui_dialog.cpp
index b3ed58581a8..4880fbfb904 100644
--- a/engines/m4/gui/gui_dialog.cpp
+++ b/engines/m4/gui/gui_dialog.cpp
@@ -1303,10 +1303,8 @@ static void TextScrn_Show(void *s, void *r, void *b, int32 destX, int32 destY) {
 
 		while (myItem) {
 			if (myItem == myTextScrn->hiliteItem) {
-				// Gr_font_set_color(myTextScrn->hiliteColor);
 				font_set_colors(myTextScrn->hiliteColor_alt1, myTextScrn->hiliteColor_alt2, myTextScrn->hiliteColor);
 			} else {
-				// Gr_font_set_color(myTextScrn->textColor);
 				font_set_colors(myTextScrn->textColor_alt1, myTextScrn->textColor_alt2, myTextScrn->textColor);
 			}
 			gr_font_write(myBuff, myItem->prompt, myItem->x, myItem->y, 0, 0); // MattP no auto spacing