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

[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:
c19a3f1cc1 SCUMM: (COMI/CJK) - add actor text color hack


Commit: c19a3f1cc1350047251b566ac9abe1099b4a30c8
    https://github.com/scummvm/scummvm/commit/c19a3f1cc1350047251b566ac9abe1099b4a30c8
Author: athrxx (athrxx at scummvm.org)
Date: 2021-08-28T14:10:00+02:00

Commit Message:
SCUMM: (COMI/CJK) - add actor text color hack

Just something I came across in the disasm while doing something else. I also ran the original CJK interpreter in VirtualBox to confirm this weirdness...

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index be5ee5b1c2..ded3b24538 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2884,6 +2884,14 @@ void ScummEngine_v7::actorTalk(const byte *msg) {
 			a->runActorTalkScript(a->_talkStartFrame);
 		}
 		_charsetColor = a->_talkColor;
+
+		// This is what the original COMI CJK interpreter does here.
+		if (_game.id == GID_CMI && _useCJKMode) {
+			if (a->_number == 1 && _currentRoom == 15)
+				_charsetColor = 28;
+			else if (a->_talkColor == 22)
+				_charsetColor = 5;
+		}
 	}
 
 	_charsetBufPos = 0;