ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hack to prevent animation hangs during Conroy's song in Sam & Max.

Browse Source 
svn-id: r5509
This commit is contained in:
Jamieson Christian
2002-11-10 18:29:59 +00:00
parent 4cf3def44b
commit afea2ba962
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/script_v2.cpp
+10 -1
View File
@@ -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;