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

6
scumm/scummvm.cpp
View file

@ -471,7 +471,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
memset(_charsetBuffer, 0, sizeof(_charsetBuffer));
_copyProtection = false;
_demoMode = false;
_noSubtitles = false;
_confirmExit = false;
_numInMsgStack = 0;
_msgPtrToAdd = NULL;
@ -659,11 +658,10 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_copyProtection = ConfMan.getBool("copy_protection");
_demoMode = ConfMan.getBool("demo_mode");
_noSubtitles = ConfMan.getBool("subtitles");
_noSubtitles ^=1;
if (ConfMan.hasKey("nosubtitles")) {
warning("Configuration key 'nosubtitles' is deprecated. Use 'subtitles' instead");
_noSubtitles = ConfMan.getBool("nosubtitles");
if (!ConfMan.hasKey("subtitles"))
ConfMan.set("subtitles", !ConfMan.getBool("nosubtitles"));
}
_confirmExit = ConfMan.getBool("confirm_exit");
_defaultTalkDelay = ConfMan.getInt("talkspeed");