From afea2ba962d3befa47be56af0e348ace92134dfd Mon Sep 17 00:00:00 2001 From: Jamieson Christian Date: Sun, 10 Nov 2002 18:29:59 +0000 Subject: [PATCH] Hack to prevent animation hangs during Conroy's song in Sam & Max. svn-id: r5509 --- scumm/script_v2.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index cffb9aade60..737223be051 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -2037,7 +2037,16 @@ void Scumm::o6_wait() return; } case 169: - //printf("waiting for message: %d\n", _vars[VAR_HAVE_MSG]); + // HACK: For Conroy Bumpus' song in Sam & Max. + // During the song three calls to o6_wait() appear, + // but because of the way in which the actor talk is done + // and the fact that the song extends beyond the span + // of each individual line, no end-of-talk is ever + // detected and the script hangs on o6_wait(). + if (_gameId == GID_SAMNMAX && vm.slot[_currentScript].number == 99 && _sound->isSoundRunning (64)) { + debug (2, "Sam & Max hack: Bypassing o6_wait() during Conroy's song."); + return; + } if (_vars[VAR_HAVE_MSG]) break;