diff options
| author | Gregory Montoir | 2005-09-02 11:24:16 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2005-09-02 11:24:16 +0000 |
| commit | 14ac8d9d215dc3edbb4ca2084787a9281da355fd (patch) | |
| tree | 816426825972812b1e8cec938e09919abf196dba /scumm/vars.cpp | |
| parent | 443cf756be85cce937c92b5051fe13b6a2ef189d (diff) | |
| download | scummvm-rg350-14ac8d9d215dc3edbb4ca2084787a9281da355fd.tar.gz scummvm-rg350-14ac8d9d215dc3edbb4ca2084787a9281da355fd.tar.bz2 scummvm-rg350-14ac8d9d215dc3edbb4ca2084787a9281da355fd.zip | |
cleanup
svn-id: r18734
Diffstat (limited to 'scumm/vars.cpp')
| -rw-r--r-- | scumm/vars.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/scumm/vars.cpp b/scumm/vars.cpp index 82d114d779..756eb6f340 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -600,13 +600,18 @@ void ScummEngine_v99he::initScummVars() { #endif void ScummEngine::initScummVars() { - if (_heversion < 70 && _version <= 6) { switch (_midiDriver) { - case MD_NULL: VAR(VAR_SOUNDCARD) = 0; break; + case MD_NULL: + VAR(VAR_SOUNDCARD) = 0; + break; case MD_PCSPK: - case MD_PCJR: VAR(VAR_SOUNDCARD) = 1; break; - case MD_ADLIB: VAR(VAR_SOUNDCARD) = 3; break; + case MD_PCJR: + VAR(VAR_SOUNDCARD) = 1; + break; + case MD_ADLIB: + VAR(VAR_SOUNDCARD) = 3; + break; default: if ((_gameId == GID_MONKEY_EGA || _gameId == GID_MONKEY_VGA || _gameId == GID_LOOM) && (_platform == Common::kPlatformPC)) { @@ -615,16 +620,12 @@ void ScummEngine::initScummVars() { Common::File f; for (int i = 82; i < 86; i++) { sprintf(buf, "%d.LFL", i); - f.open(buf); - if (f.isOpen() == false) + if (!Common::File::exists(buf)) error("Native MIDI support requires Roland patch from LucasArts"); - f.close(); } } else if (_gameId == GID_MONKEY_EGA) { - Common::File f; - f.open("DISK09.LEC"); - if (f.isOpen() == false) - error("Native MIDI support requires Roland patch from LucasArts"); + if (!Common::File::exists("DISK09.LEC")) + error("Native MIDI support requires Roland patch from LucasArts"); } VAR(VAR_SOUNDCARD) = 4; } else { @@ -670,10 +671,10 @@ void ScummEngine::initScummVars() { } if (_version >= 4) { VAR(VAR_HEAPSPACE) = 1400; - VAR(VAR_FIXEDDISK) = true; + VAR(VAR_FIXEDDISK) = 1; } if (_version >= 5) - VAR(VAR_MOUSEPRESENT) = true; + VAR(VAR_MOUSEPRESENT) = 1; if (_version == 6) VAR(VAR_V6_EMSSPACE) = 10000; } |