[Scummvm-git-logs] scummvm master -> 357726ecaf8a6dbce54797849545232b1dc4329e

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
357726ecaf M4: RIDDLE: Fix colors in TextField::draw(). That should finally fix bug #15797


Commit: 357726ecaf8a6dbce54797849545232b1dc4329e
    https://github.com/scummvm/scummvm/commit/357726ecaf8a6dbce54797849545232b1dc4329e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-06-06T23:51:16+01:00

Commit Message:
M4: RIDDLE: Fix colors in TextField::draw(). That should finally fix bug #15797

Changed paths:
    engines/m4/gui/gui_cheapo.cpp


diff --git a/engines/m4/gui/gui_cheapo.cpp b/engines/m4/gui/gui_cheapo.cpp
index 3d9c4d58a07..f6709aef5ec 100644
--- a/engines/m4/gui/gui_cheapo.cpp
+++ b/engines/m4/gui/gui_cheapo.cpp
@@ -28,6 +28,7 @@
 #include "m4/adv_r/adv_trigger.h"
 #include "m4/core/cstring.h"
 #include "m4/core/errors.h"
+#include "m4/m4.h"
 #include "m4/mem/mem.h"
 #include "m4/mem/memman.h"
 #include "m4/vars.h"
@@ -137,9 +138,15 @@ void TextField::draw(GrBuff *myBuffer) {
 	Buffer *myBuff = myBuffer->get_buffer();
 	gr_color_set(__BLACK);
 	gr_buffer_rect_fill(myBuff, _x1, _y1, _x2 - _x1, _y2 - _y1);
+	
+	if (IS_RIDDLE) {
+		gr_font_set_color(gr_pal_get_ega_color(15) & 0xFF);
+		gr_font_set(_G(font_inter));
+	} else {
+		gr_font_set(_G(font_inter));
+		font_set_colors(1, 2, 3);
+	}
 
-	gr_font_set(_G(font_inter));
-	font_set_colors(1, 2, 3);
 	gr_font_write(myBuff, _string, _x1, _y1, 0, 1);
 	myBuffer->release();