diff options
| author | Travis Howell | 2004-08-12 04:19:47 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-12 04:19:47 +0000 |
| commit | bca746e80211d1b28cddcb7a5791d8dd20984f11 (patch) | |
| tree | 24b29d4165140622bfaab7b849563eed23af29b3 /scumm/string.cpp | |
| parent | f2c3731f7b0539a06e30868606e5e569be3d2936 (diff) | |
| download | scummvm-rg350-bca746e80211d1b28cddcb7a5791d8dd20984f11.tar.gz scummvm-rg350-bca746e80211d1b28cddcb7a5791d8dd20984f11.tar.bz2 scummvm-rg350-bca746e80211d1b28cddcb7a5791d8dd20984f11.zip | |
Fix FOA regression I caused.
svn-id: r14562
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index cd4029c4e4..e9bad9e88e 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -46,14 +46,17 @@ void ScummEngine::unkMessage1(const byte *msg) { if (buffer[0] == 0xFF && buffer[1] == 10) { uint32 a, b; + int channel = 0; a = buffer[2] | (buffer[3] << 8) | (buffer[6] << 16) | (buffer[7] << 24); b = buffer[10] | (buffer[11] << 8) | (buffer[14] << 16) | (buffer[15] << 24); // Sam and Max uses a caching system, printing empty messages // and setting VAR_V6_SOUNDMODE beforehand. See patch 609791. - if (VAR(VAR_V6_SOUNDMODE) != 2) - _sound->talkSound(a, b, 1, VAR(VAR_V6_SOUNDMODE)); + if (_gameId == GID_SAMNMAX && VAR(VAR_V6_SOUNDMODE) != 2) + channel = VAR(VAR_V6_SOUNDMODE); + + _sound->talkSound(a, b, 1, channel); } } |