[Scummvm-git-logs] scummvm master -> 269e9a55aff874ec0ef8a60e733626dc9e3a3fd2

[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:
269e9a55af GLK: COMPREHEND: Workaround for Crimson Crown missing text in ball cutscene


Commit: 269e9a55aff874ec0ef8a60e733626dc9e3a3fd2
    https://github.com/scummvm/scummvm/commit/269e9a55aff874ec0ef8a60e733626dc9e3a3fd2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-03T19:30:59-08:00

Commit Message:
GLK: COMPREHEND: Workaround for Crimson Crown missing text in ball cutscene

Changed paths:
    engines/glk/comprehend/pics.cpp


diff --git a/engines/glk/comprehend/pics.cpp b/engines/glk/comprehend/pics.cpp
index 461237f41c..c64060c23a 100644
--- a/engines/glk/comprehend/pics.cpp
+++ b/engines/glk/comprehend/pics.cpp
@@ -141,7 +141,7 @@ bool Pics::ImageFile::doImageOp(Pics::ImageContext *ctx) const {
 		break;
 
 	case OPCODE_TEXT_CHAR:
-	case OPCODE_TEXT_OUTLINE:
+	case OPCODE_TEXT_OUTLINE: {
 		// Text outline mode draws a bunch of pixels that sort of looks like the char
 		// TODO: See if the outline mode is ever used
 		if (opcode == OPCODE_TEXT_OUTLINE)
@@ -153,10 +153,16 @@ bool Pics::ImageFile::doImageOp(Pics::ImageContext *ctx) const {
 			a = '?';
 		}
 
+		uint color = ctx->_fillColor;
+		// FIXME: Properly display text color in Crimson Crown
+		if (g_vm->getGameID() == "crimsoncrown" && color == 0x000000ff)
+			color = G_COLOR_WHITE;
+
 		debugC(kDebugGraphics, "draw_char(%c)", a);
-		ctx->_font->drawChar(ctx->_drawSurface, a, ctx->_textX, ctx->_textY, ctx->_fillColor);
+		ctx->_font->drawChar(ctx->_drawSurface, a, ctx->_textX, ctx->_textY, color);
 		ctx->_textX += ctx->_font->getCharWidth(a);
 		break;
+	}
 
 	case OPCODE_SET_SHAPE:
 		debugC(kDebugGraphics, "set_shape_type(%.2x)", param);