diff options
author | James Brown | 2002-09-16 08:22:05 +0000 |
---|---|---|
committer | James Brown | 2002-09-16 08:22:05 +0000 |
commit | 02f9056b4a4f124e59c8172f1c70773d9482e1c6 (patch) | |
tree | 94f128046d02f7697a7f6f207b1087ced0ebb9fe /scumm/string.cpp | |
parent | e0e780951824c187dcb95f5aa83331ac9faa35fd (diff) | |
download | scummvm-rg350-02f9056b4a4f124e59c8172f1c70773d9482e1c6.tar.gz scummvm-rg350-02f9056b4a4f124e59c8172f1c70773d9482e1c6.tar.bz2 scummvm-rg350-02f9056b4a4f124e59c8172f1c70773d9482e1c6.zip |
609791: Sam and Max 'phantom sound' (precaching) hack.
svn-id: r4947
Diffstat (limited to 'scumm/string.cpp')
-rw-r--r-- | scumm/string.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 0c5922af21..c51eb31e5a 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -173,10 +173,14 @@ void Scumm::unkMessage1() a = buffer[2] | (buffer[3] << 8) | (buffer[6] << 16) | (buffer[7] << 24); b = buffer[10] | (buffer[11] << 8) | (buffer[14] << 16) | (buffer[15] << 24); -// if (_saveSound != 1) - _sound->talkSound(a, b, 1, -1); + + // Sam and Max uses a caching system, printing empty messages + // and setting VAR_V6_SOUNDMODE beforehand. See patch 609791. + // FIXME: There are other VAR_V6_SOUNDMODE states, as + // mentioned in the patch. FIXME after iMUSE is done. + if (_gameId != GID_SAMNMAX || (_vars[VAR_V6_SOUNDMODE] != 2)) + _sound->talkSound(a, b, 1, -1); } -// warning("unkMessage1(\"%s\")", buffer); } void Scumm::unkMessage2() |