diff options
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scumm.cpp | 8 | ||||
| -rw-r--r-- | scumm/scumm.h | 1 | ||||
| -rw-r--r-- | scumm/vars.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 976b0745a1..fe3e98828c 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -668,6 +668,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS VAR_USERPUT = 0xFF; VAR_SOUNDRESULT = 0xFF; VAR_TALKSTOP_KEY = 0xFF; + VAR_FADE_DELAY = 0xFF; VAR_NOSUBTITLES = 0xFF; VAR_SOUNDPARAM = 0xFF; @@ -1350,10 +1351,6 @@ void ScummEngine::initScummVars() { VAR(VAR_MOUSEPRESENT) = true; if (_version == 6) VAR(VAR_V6_EMSSPACE) = 10000; - - // Sets fade delay - // byte VAR_FADE_DELAY = (_version == 7) ? 117 : 59; - // VAR(VAR_FADE_DELAY) = 3; } if ((_features & GF_MACINTOSH) && (_version == 3)) { @@ -1374,6 +1371,9 @@ void ScummEngine::initScummVars() { VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles"); } + if (VAR_FADE_DELAY != 0xFF) + VAR(VAR_FADE_DELAY) = 3; + VAR(VAR_CHARINC) = 4; setTalkingActor(0); } diff --git a/scumm/scumm.h b/scumm/scumm.h index e898f2be4d..2832bd0495 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -1204,6 +1204,7 @@ public: byte VAR_USERPUT; byte VAR_SOUNDRESULT; byte VAR_TALKSTOP_KEY; + byte VAR_FADE_DELAY; byte VAR_NOSUBTITLES; byte VAR_SOUNDPARAM; diff --git a/scumm/vars.cpp b/scumm/vars.cpp index 418223f143..b2b7237758 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -91,6 +91,7 @@ void ScummEngine::setupScummVars() { VAR_SOUNDPARAM3 = 66; } if (_version >= 5) { + VAR_FADE_DELAY = 59; VAR_MOUSEPRESENT = 67; VAR_PERFORMANCE_1 = 68; VAR_PERFORMANCE_2 = 69; // Zak256 Note: Cashcard for Zak @@ -335,6 +336,7 @@ void ScummEngine_v7::setupScummVars() { VAR_DEFAULT_TALK_DELAY = 114; VAR_CHARINC = 115; VAR_DEBUGMODE = 116; + VAR_FADE_DELAY = 117; // Full Throttle specific VAR_CHARSET_MASK = 119; |