diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp index 2aa46a9dd3e..43d5d76f22a 100644 --- a/engines/sci/engine/script_patches.cpp +++ b/engines/sci/engine/script_patches.cpp @@ -9385,6 +9385,36 @@ static const uint16 larry5PatchPokerJackpotInit[] = { PATCH_END }; +// The way LSL5's Talker class is written, there is a small recurring chance +// that text boxes will time out immediately, and an even smaller chance that +// they won't time out at all. This was fixed in the German, French, Spanish, +// and Italian versions of the game. +// +// Applies to: English VGA version +// Responsible method: Talker::doit in script 928 + +static const uint16 larry5SignatureTalkerDisposeWhenDone[] = { + 0x76, // push0 + 0x43, 0x42, 0x00, // callk GetTime + SIG_MAGICDWORD, + 0x36, // push + 0x63, 0x5c, // pToa ticks + 0x1e, // gt? + SIG_ADDTOOFFSET(+3), + SIG_END +}; + +static const uint16 larry5PatchTalkerDisposeWhenDone[] = { + 0x89, 0x58, // lsg 58 [ gGameTime ] + 0x63, 0x5c, // pToa ticks + 0x04, // sub + 0x36, // push + 0x35, 0x00, // ldi 00 + 0x1e, // gt? + 0x31, 0x08, // bnt 08 + PATCH_END +}; + // script, description, signature patch static const SciScriptPatcherEntry larry5Signatures[] = { { true, 0, "update stopGroop client", 1, larry5SignatureUpdateStopGroopClient, larry5PatchUpdateStopGroopClient }, @@ -9395,6 +9425,7 @@ static const SciScriptPatcherEntry larry5Signatures[] = { { true, 280, "English-only: fix green card limo bug", 1, larry5SignatureGreenCardLimoBug, larry5PatchGreenCardLimoBug }, { true, 380, "German-only: Enlarge Patti Textbox", 1, larry5SignatureGermanEndingPattiTalker, larry5PatchGermanEndingPattiTalker }, { true, 500, "speed up palette animation", 1, larry5SignatureRoom500PaletteAnimation, larry5PatchRoom500PaletteAnimation }, + { true, 928, "English-only: fix text box timeout", 1, larry5SignatureTalkerDisposeWhenDone, larry5PatchTalkerDisposeWhenDone }, SCI_SIGNATUREENTRY_TERMINATOR };