SCUMM: Fix Sophia speaking with Indy's voice when looking at him

[dwatteau]

Context

In Indy 4, you can play as Sophia in some scenes (for example, in the Azores).

But if you look at Indy with her, she'll speak with Indy's voice, in the Talkie version.

The culprit seems to be script 68-161:

(48) if (Var[181] == 2) {
(42)   chainScript(162,[]);
(48) } else if (Var[181] == 11) {
(48)   if (VAR_EGO == 2) {
(D8)     printEgo([Text(sound(0x865362C, 0xA) + "No thanks.")]);
(18)   } else {
(D8)     printEgo([Text(sound(0x8638E5D, 0xE) + "There's nothing to look at.")]);
(**)   }
(18) } else {
       # Here:
(D8)   printEgo([Text(sound(0x8638E5D, 0xE) + "There's nothing to look at.")]);
(**) }
(A0) stopObjectCode();
END

I'm not sure what Var[181] is, but when using the "Look at" verb, we reach the last else block. But this default case uses the same sample for Indy and Sophia, hence the wrong voice when playing with Sophia…

Proposed workaround

Fortunately, script 68-4 has a dub for the exact same line, with Sophia's voice.

So I just reuse its audio content if _actorToPrintStrFor is 2 (= playing as Sophia) in this scene, and if the current dialogue line points to the audio offset that we expect. I'm not changing the text itself.

AFAIK, there's only a single, identical MONSTER.SOU file for all talkie ports of this game (DOS, Macintosh, FM-TOWNS), but checking the audio offset is still safer, especially for fan translations or any eventual fandub or unknown version of the game.

How to test

1. Play any talkie version, start the game with boot param 6005, use Esc to skip the fake intro
2. Talk to Sophia, ask her to take the lead (opt. 2)
3. As Sophia, use the "Look at" verb on Indy
4. She should now speak with her own voice

(I've tested the DOS/English version from GOG, my old Macintosh/English CD, and a French fan translation)

[eriktorbjorn]

I assume this will try to apply to the patch to the Amiga version as well, but I guess that won't make any difference since it should never find the offending string?

[dwatteau]

I assume this will try to apply to the patch to the Amiga version as well, but I guess that won't make any difference since it should never find the offending string?

I don't have this version, but I thought it would always have the Floppy variant (which I'm excluding), looking at this:
https://github.com/scummvm/scummvm/blob/branch-2-6/devtools/scumm-md5.txt#L283

But otherwise yeah, I try to write my workarounds so that they're loose-enough to be applied on translations (incl. fan translations) and other variants when it's possible, while keeping some safety checks if I rely on some hardcoded values.

[eriktorbjorn]

I don't have it either, I just looked at this bit of detection_tables.h, quite possibly misreading it:

	{"atlantis", "Floppy", 0, GID_INDY4,    5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO2(GUIO_NOSPEECH, GUIO_ENHANCEMENTS)},
	{"atlantis", "Amiga", 0, GID_INDY4,  5, 0, MDT_AMIGA, 0, Common::kPlatformAmiga, GUIO3(GUIO_NOSPEECH, GUIO_MIDIAMIGA, GUIO_ENHANCEMENTS)},

[eriktorbjorn]

I don't have it either, I just looked at this bit of detection_tables.h, quite possibly misreading it:

	{"atlantis", "Floppy", 0, GID_INDY4,    5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO2(GUIO_NOSPEECH, GUIO_ENHANCEMENTS)},
	{"atlantis", "Amiga", 0, GID_INDY4,  5, 0, MDT_AMIGA, 0, Common::kPlatformAmiga, GUIO3(GUIO_NOSPEECH, GUIO_MIDIAMIGA, GUIO_ENHANCEMENTS)},

[dwatteau]

Ah yes indeed, Floppy is in the description field and not the variant field, for the Amiga version of Monkey 2, my bad.

I'll just explicitly exclude the Amiga version in my check, better safe than sorry!

Thanks for noticing this.

[bluegr]

Nice work, thanks! Merging