aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-02-11 05:38:15 +0000
committerTravis Howell2004-02-11 05:38:15 +0000
commitac31a3ffe8a5c15c1c314e532b1c3fa2ab5ad126 (patch)
treeb79c1b959f429adf8ba87670260be00835dbc10a /scumm
parente451c498ac0af11d69ee2a973434fc1a1782a92c (diff)
downloadscummvm-rg350-ac31a3ffe8a5c15c1c314e532b1c3fa2ab5ad126.tar.gz
scummvm-rg350-ac31a3ffe8a5c15c1c314e532b1c3fa2ab5ad126.tar.bz2
scummvm-rg350-ac31a3ffe8a5c15c1c314e532b1c3fa2ab5ad126.zip
Ignore initial setting of VAR_NOSUBTITLES
svn-id: r12821
Diffstat (limited to 'scumm')
-rw-r--r--scumm/script.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 5c329c31ba..2e929f368f 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -551,7 +551,10 @@ void ScummEngine::writeVar(uint var, int value) {
// stay in sync with loom cd subtitle var
if ((_gameId == GID_LOOM256 || _features & GF_HUMONGOUS) && var == VAR_NOSUBTITLES) {
assert(value == 0 || value == 1);
- ConfMan.set("subtitles", (value == 0));
+ if ((_features & GF_HUMONGOUS) && vm.slot[_currentScript].number == 1)
+ value = !ConfMan.getBool("subtitles");
+ else
+ ConfMan.set("subtitles", (value == 0));
}
if ((_varwatch == (int)var) || (_varwatch == 0)) {