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

Fix bug #780922 - SAM: Conroy doesn't stop singing when escaping cutscene

Browse Source 
svn-id: r14524
This commit is contained in:
Travis Howell
2004-08-09 00:58:21 +00:00
parent 809c3bd943
commit dc476abe60
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/string.cpp
+2 -4
View File
@@ -52,10 +52,8 @@ void ScummEngine::unkMessage1(const byte *msg) {
// 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 || (VAR(VAR_V6_SOUNDMODE) != 2))
_sound->talkSound(a, b, 1);
if (VAR(VAR_V6_SOUNDMODE) != 2)
_sound->talkSound(a, b, 1, VAR(VAR_V6_SOUNDMODE));
}
}