diff options
| author | Michael Pearce | 2002-09-09 04:54:54 +0000 |
|---|---|---|
| committer | Michael Pearce | 2002-09-09 04:54:54 +0000 |
| commit | c7eff375c5343d1ff597a2e7df91c3280e68d796 (patch) | |
| tree | a863b4eb48f016da873a1717eaf5604c9b5bf4a1 /scumm | |
| parent | c0df1c2df203c672070e68375cc1e45831509479 (diff) | |
| download | scummvm-rg350-c7eff375c5343d1ff597a2e7df91c3280e68d796.tar.gz scummvm-rg350-c7eff375c5343d1ff597a2e7df91c3280e68d796.tar.bz2 scummvm-rg350-c7eff375c5343d1ff597a2e7df91c3280e68d796.zip | |
Applied eriktorbjorn's 'largo' monkey2 sfx fix
svn-id: r4907
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v1.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/scumm/script_v1.cpp b/scumm/script_v1.cpp index 96eb92394a..7c9f6f50dc 100644 --- a/scumm/script_v1.cpp +++ b/scumm/script_v1.cpp @@ -1455,8 +1455,21 @@ void Scumm::o5_isActorInBox() void Scumm::o5_isEqual() { - int16 a = readVar(fetchScriptWord()); - int16 b = getVarOrDirectWord(0x80); + int16 a, b; + int var; + + var = fetchScriptWord(); + a = readVar(var); + b = getVarOrDirectWord(0x80); + + // HACK: See bug report #602348. The sound effects for Largo's screams + // are only played on type 5 soundcards. However, there is at least one + // other sound effect (the bartender spitting) which is only played on + // type 3 soundcards. + + if (_gameId == GID_MONKEY2 && var == VAR_SOUNDCARD && b == 5) + b = a; + if (b == a) ignoreScriptWord(); else |