[Scummvm-git-logs] scummvm master -> 6373dd1ffb9703314eedcc05363bfe9b92823e32

[athrxx]

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:
6373dd1ffb SCUMM: (COMI/CJK) - fix GUI font


Commit: 6373dd1ffb9703314eedcc05363bfe9b92823e32
    https://github.com/scummvm/scummvm/commit/6373dd1ffb9703314eedcc05363bfe9b92823e32
Author: athrxx (athrxx at scummvm.org)
Date: 2022-08-07T20:10:00+02:00

Commit Message:
SCUMM: (COMI/CJK) - fix GUI font

It it supposed to be drawn without outline for text color 0 (applies to COMI, only).

Changed paths:
    engines/scumm/nut_renderer.cpp


diff --git a/engines/scumm/nut_renderer.cpp b/engines/scumm/nut_renderer.cpp
index 17760f64cce..52d6b345e9e 100644
--- a/engines/scumm/nut_renderer.cpp
+++ b/engines/scumm/nut_renderer.cpp
@@ -476,7 +476,9 @@ int NutRenderer::draw2byte(byte *buffer, Common::Rect &clipRect, int x, int y, i
 	byte bits = *src;
 	const byte *origSrc = src;
 
-	for (int step = 0; step < _2byteSteps; ++step) {
+	int startFrame = (_2byteSteps == 4 && col == 0) ? _2byteSteps - 1 : 0;
+
+	for (int step = startFrame; step < _2byteSteps; ++step) {
 		int offX = MAX<int>(x + _2byteShadowXOffsetTable[step], clipRect.left);
 		int offY = MAX<int>(y + _2byteShadowYOffsetTable[step], clipRect.top);
 		byte drawColor = _2byteColorTable[step];