[Scummvm-git-logs] scummvm master -> 9b7654c56b153c11ba88934340acdd57a1714c5c
bluegr
noreply at scummvm.org
Mon Apr 4 19:15:22 UTC 2022
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:
9b7654c56b SCUMM: Fix text color when Mandible speaks with Goodmold
Commit: 9b7654c56b153c11ba88934340acdd57a1714c5c
https://github.com/scummvm/scummvm/commit/9b7654c56b153c11ba88934340acdd57a1714c5c
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-04-04T22:15:18+03:00
Commit Message:
SCUMM: Fix text color when Mandible speaks with Goodmold
Script 203 in room 90 only contains two lines, but the second one
is missing its color parameter in the original Talkie script.
Changed paths:
engines/scumm/script_v5.cpp
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 74121f4d039..6a6d76be4c4 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1830,7 +1830,7 @@ void ScummEngine_v5::o5_resourceRoutines() {
loadFlObject(getVarOrDirectWord(PARAM_2), resid);
break;
- // TODO: For the following see also Hibarnatus' information on bug #7315.
+ // TODO: For the following see also Hibernatus' information on bug #7315.
case 32:
// TODO (apparently never used in FM-TOWNS)
debug(0, "o5_resourceRoutines %d not yet handled (script %d)", op, vm.slot[_currentScript].number);
@@ -2997,6 +2997,12 @@ void ScummEngine_v5::decodeParseString() {
// herself to bishop Mandible. Of all the places to put
// a typo...
printString(textSlot, (const byte *)"I am Chaos.");
+ } else if (_game.id == GID_LOOM && _game.version == 4 && _roomResource == 90 &&
+ vm.slot[_currentScript].number == 203 && _string[textSlot].color == 0x0F && _enableEnhancements) {
+ // WORKAROUND: When Mandible speaks with Goodmold, his second
+ // speech line is missing its color parameter.
+ _string[textSlot].color = 0x0A;
+ printString(textSlot, _scriptPointer);
} else if (_game.id == GID_INDY4 && _roomResource == 23 && vm.slot[_currentScript].number == 167 &&
len == 24 && 0==memcmp(_scriptPointer+16, "pregod", 6)) {
// WORKAROUND for bug #2961.
More information about the Scummvm-git-logs
mailing list