aboutsummaryrefslogtreecommitdiff
path: root/scumm/script.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-09-01 03:08:32 +0000
committerTravis Howell2003-09-01 03:08:32 +0000
commitc5141005e0e1e3ed0ac082d7c357683762e0bb0c (patch)
tree6f74cf8b91c97d12c2865efc07ff6b4fdf7e88fc /scumm/script.cpp
parentb43a6f649616ec65d92b7154b0fe08fc348eb89c (diff)
downloadscummvm-rg350-c5141005e0e1e3ed0ac082d7c357683762e0bb0c.tar.gz
scummvm-rg350-c5141005e0e1e3ed0ac082d7c357683762e0bb0c.tar.bz2
scummvm-rg350-c5141005e0e1e3ed0ac082d7c357683762e0bb0c.zip
Add CD audio check for loomcd
Revert last change, since it wipped out intro. text. svn-id: r9947
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r--scumm/script.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index f0533d1b4e..de1bc96afd 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -544,14 +544,8 @@ 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)) {
- // Override default initial setting of subtitles enabled
- if (vm.slot[_currentScript].number == 1)
- value = _noSubtitles;
- else
- _noSubtitles = (value != 0);
- }
-
+ if (_gameId == GID_LOOM256 && var == VAR_NOSUBTITLES && (value == 0 || value == 1))
+ _noSubtitles = (value != 0);
if ((_varwatch == (int)var) || (_varwatch == 0)) {
if (vm.slot[_currentScript].number < 100)