aboutsummaryrefslogtreecommitdiff
path: root/scumm/script.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-09-01 01:50:07 +0000
committerTravis Howell2003-09-01 01:50:07 +0000
commitb43a6f649616ec65d92b7154b0fe08fc348eb89c (patch)
treecf3d1221f58df68abe15731162d4517213fb34dc /scumm/script.cpp
parent82fea4967149a5edd92b90d4cefb181b7587a5e1 (diff)
downloadscummvm-rg350-b43a6f649616ec65d92b7154b0fe08fc348eb89c.tar.gz
scummvm-rg350-b43a6f649616ec65d92b7154b0fe08fc348eb89c.tar.bz2
scummvm-rg350-b43a6f649616ec65d92b7154b0fe08fc348eb89c.zip
Override default initial setting of subtitles enabled in loomcd
svn-id: r9946
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r--scumm/script.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 18367dbe4a..f0533d1b4e 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -544,8 +544,14 @@ void Scumm::writeVar(uint var, int value) {
_scummVars[var] = value;
// stay in sync with loom cd subtitle var
- if (_gameId == GID_LOOM256 && var == VAR_NOSUBTITLES && (value == 0 || value == 1))
- _noSubtitles = (value != 0);
+ if (_gameId == GID_LOOM256 && var == VAR_NOSUBTITLES && (value == 0 || value == 1)) {
+ // Override default initial setting of subtitles enabled
+ if (vm.slot[_currentScript].number == 1)
+ value = _noSubtitles;
+ else
+ _noSubtitles = (value != 0);
+ }
+
if ((_varwatch == (int)var) || (_varwatch == 0)) {
if (vm.slot[_currentScript].number < 100)