aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-07-24 04:36:54 +0000
committerTravis Howell2004-07-24 04:36:54 +0000
commit086c8da888b4a016151f23ea26b775104ad5d5dc (patch)
treec7e030c19f0ae0e1327c7cdfc4f81c7685343a2f /scumm/scumm.cpp
parent334343a3403a8e875a08824a897c3158d221dca1 (diff)
downloadscummvm-rg350-086c8da888b4a016151f23ea26b775104ad5d5dc.tar.gz
scummvm-rg350-086c8da888b4a016151f23ea26b775104ad5d5dc.tar.bz2
scummvm-rg350-086c8da888b4a016151f23ea26b775104ad5d5dc.zip
Enable VAR_FADE_DELAY
svn-id: r14309
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r--scumm/scumm.cpp8
1 files changed, 4 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);
}