diff options
| author | Max Horn | 2003-05-14 09:47:53 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-14 09:47:53 +0000 |
| commit | 05c44e606ecda344801adb957aebee5160a35f2e (patch) | |
| tree | 1aa3b43859f0d1ea63d146b29de410b31748b6e0 /scumm/scummvm.cpp | |
| parent | bb3e596951ad2140092ab01977ac1b2e54567d1b (diff) | |
| download | scummvm-rg350-05c44e606ecda344801adb957aebee5160a35f2e.tar.gz scummvm-rg350-05c44e606ecda344801adb957aebee5160a35f2e.tar.bz2 scummvm-rg350-05c44e606ecda344801adb957aebee5160a35f2e.zip | |
various V8 tweaks
svn-id: r7494
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 49f45aa1a3..9c6333755e 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -795,7 +795,12 @@ void Scumm::initScummVars() { if (!(_features & GF_AFTER_V6)) VAR(VAR_V5_TALK_STRING_Y) = -0x50; - if (!(_features & GF_AFTER_V7)) { + if (_features & GF_AFTER_V8) { // Fixme: How do we deal with non-cd installs? + VAR(VAR_CURRENTDISK) = 1; + VAR(VAR_LANGUAGE) = _language; + } else if (_features & GF_AFTER_V7) { + VAR(VAR_V6_EMSSPACE) = 10000; + } else { VAR(VAR_CURRENTDRIVE) = 0; VAR(VAR_FIXEDDISK) = true; VAR(VAR_SOUNDCARD) = 3; @@ -815,14 +820,8 @@ void Scumm::initScummVars() { // Setup light VAR(VAR_CURRENT_LIGHTS) = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen; - } else { - VAR(VAR_V6_EMSSPACE) = 10000; } - if (_features & GF_AFTER_V8) { // Fixme: How do we deal with non-cd installs? - VAR(VAR_CURRENTDISK) = 1; - VAR(VAR_LANGUAGE) = _language; - } VAR(VAR_CHARINC) = 4; VAR(VAR_TALK_ACTOR) = 0; |