libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-15 14:28:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed S&M Bumpusville hack made unnecessary by

Browse Source 
another fix (presumably the BOT Diner fix).

svn-id: r8453
This commit is contained in:
Jamieson Christian 2003-06-12 19:06:52 +00:00
parent baaf6502ec
commit c6f7c50483
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scumm/script_v6.cpp
View File

@ -2047,17 +2047,6 @@ void Scumm_v6::o6_wait() {
break;
return;
case 169:
// 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 (VAR(VAR_HAVE_MSG))
break;
return;