diff options
| author | Travis Howell | 2004-06-28 09:03:08 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-06-28 09:03:08 +0000 |
| commit | ba23b9f96e1a99d8271c4be9c445ebce986f8c6a (patch) | |
| tree | 5127d9512e0df6186feb7fea957b4a5d3078eaef /scumm/script.cpp | |
| parent | 6b99d5a9718217d174ca23074057eb2f08b5c30d (diff) | |
| download | scummvm-rg350-ba23b9f96e1a99d8271c4be9c445ebce986f8c6a.tar.gz scummvm-rg350-ba23b9f96e1a99d8271c4be9c445ebce986f8c6a.tar.bz2 scummvm-rg350-ba23b9f96e1a99d8271c4be9c445ebce986f8c6a.zip | |
Fix missing subtitles in Conroy Bumpus' song in Sam & Max
svn-id: r14101
Diffstat (limited to 'scumm/script.cpp')
| -rw-r--r-- | scumm/script.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 1288c1c812..8d1f353c49 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -482,8 +482,12 @@ int ScummEngine::readVar(uint var) { } } - if ((_gameId == GID_LOOM256 || _features & GF_HUMONGOUS) && var == VAR_NOSUBTITLES) { - return !ConfMan.getBool("subtitles"); + if (var == VAR_NOSUBTITLES) { + if (_gameId == GID_LOOM256 || _features & GF_HUMONGOUS) + return !ConfMan.getBool("subtitles"); + else if (_gameId == GID_SAMNMAX) + // Used as VAR_SUBTITLES in Sam & Max during Conroy Bumpus song + return ConfMan.getBool("subtitles"); } checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)"); |