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

[eriktorbjorn]

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:
a5d7d9fdd2 SCUMM: Limit Loom CD Choas/Chaos workaround to the appropriate script


Commit: a5d7d9fdd2bafc457d1c8e34dd9d263848be780c
    https://github.com/scummvm/scummvm/commit/a5d7d9fdd2bafc457d1c8e34dd9d263848be780c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-08-03T21:05:24+02:00

Commit Message:
SCUMM: Limit Loom CD Choas/Chaos workaround to the appropriate script

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index a0a6cea73b..e4b4e8c571 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -2751,11 +2751,11 @@ void ScummEngine_v5::decodeParseString() {
 		case 15:{	// SO_TEXTSTRING
 				const int len = resStrLen(_scriptPointer);
 
-				if (_game.id == GID_LOOM && strcmp((const char *) _scriptPointer, "I am Choas.") == 0) {
+				if (_game.id == GID_LOOM && vm.slot[_currentScript].number == 95 && strcmp((const char *)_scriptPointer, "I am Choas.") == 0) {
 					// WORKAROUND: This happens when Chaos introduces
 					// herself to bishop Mandible. Of all the places to put
 					// a typo...
-					printString(textSlot, (const byte *) "I am Chaos.");
+					printString(textSlot, (const byte *)"I am Chaos.");
 				} 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.