From b43a6f649616ec65d92b7154b0fe08fc348eb89c Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Mon, 1 Sep 2003 01:50:07 +0000 Subject: [PATCH] Override default initial setting of subtitles enabled in loomcd svn-id: r9946 --- scumm/script.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scumm/script.cpp b/scumm/script.cpp index 18367dbe4a3..f0533d1b4e9 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)