diff options
| author | Max Horn | 2003-05-08 21:02:46 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-08 21:02:46 +0000 |
| commit | af14dabc75d23ea1bec9bffecbd5de2756ad561a (patch) | |
| tree | f45653fa4a038e3ccfeb7f849224e67ee2d371f9 | |
| parent | 6d2c0de5f2a1fba9398d4a72e56fbead920b82de (diff) | |
| download | scummvm-rg350-af14dabc75d23ea1bec9bffecbd5de2756ad561a.tar.gz scummvm-rg350-af14dabc75d23ea1bec9bffecbd5de2756ad561a.tar.bz2 scummvm-rg350-af14dabc75d23ea1bec9bffecbd5de2756ad561a.zip | |
more v2 var fixes
svn-id: r7396
| -rw-r--r-- | scumm/scummvm.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 2f8acf8257..7fb70eee68 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -786,6 +786,11 @@ void Scumm::scummInit() { void Scumm::initScummVars() { + + // FIXME + if (_features & GF_AFTER_V2) + return; + if (!(_features & GF_AFTER_V6)) VAR(VAR_V5_TALK_STRING_Y) = -0x50; @@ -1729,13 +1734,13 @@ void Scumm::processKbd() { return; } - if (_lastKeyHit == VAR(VAR_RESTART_KEY)) { + if (VAR_RESTART_KEY != 0xFF && _lastKeyHit == VAR(VAR_RESTART_KEY)) { warning("Restart not implemented"); // pauseGame(true); return; } - if (_lastKeyHit == VAR(VAR_PAUSE_KEY)) { + if (VAR_PAUSE_KEY != 0xFF && _lastKeyHit == VAR(VAR_PAUSE_KEY)) { pauseGame(true); /* pause */ return; @@ -1755,7 +1760,7 @@ void Scumm::processKbd() { if (_features & GF_AFTER_V7) runScript(VAR(VAR_UNK_SCRIPT_2), 0, 0, 0); return; - } else if (_lastKeyHit == VAR(VAR_TALKSTOP_KEY)) { + } else if (VAR_TALKSTOP_KEY != 0xFF && _lastKeyHit == VAR(VAR_TALKSTOP_KEY)) { _talkDelay = 0; if (_sound->_sfxMode & 2) stopTalk(); @@ -2213,10 +2218,12 @@ void Scumm::launch() { scummInit(); - if (!(_features & GF_AFTER_V7)) - VAR(VAR_VERSION) = 21; - - VAR(VAR_DEBUGMODE) = _debugMode; + if (!(_features & GF_AFTER_V2)) { + if (!(_features & GF_AFTER_V7)) + VAR(VAR_VERSION) = 21; + + VAR(VAR_DEBUGMODE) = _debugMode; + } if (_gameId == GID_MONKEY) _scummVars[74] = 1225; |