thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get rid of _noSubtitles, use ConfigManager directly instead; clean up some IMuseDigital oddities

Browse source 
svn-id: r11966
This commit is contained in:
Max Horn 2003-12-27 15:22:59 +00:00
parent a567b741e7
commit 17c189d1f9
14 changed files with 57 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scumm/script.cpp
View file

@ -22,6 +22,7 @@
#include "stdafx.h"
#include "common/config-manager.h"
#include "common/util.h"
#include "scumm/actor.h"
@ -476,7 +477,7 @@ int ScummEngine::readVar(uint var) {
}
if (_gameId == GID_LOOM256 && var == VAR_NOSUBTITLES) {
return _noSubtitles;
return !ConfMan.getBool("subtitles");
}
checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)");
@ -542,8 +543,10 @@ void ScummEngine::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) {
assert(value == 0 || value == 1);
ConfMan.set("subtitles", (value == 0));
}
if ((_varwatch == (int)var) || (_varwatch == 0)) {
if (vm.slot[_currentScript].number < 100)