aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-09-10 10:45:22 +0000
committerTravis Howell2004-09-10 10:45:22 +0000
commit00452c40736dedc2cfdb0c01d306856b0a6b452d (patch)
tree689a90d852f255bedef18551a744b3eb86522f74 /scumm/scumm.cpp
parent98f8433396aaecb8bc23f13566b6cb9ac383c201 (diff)
downloadscummvm-rg350-00452c40736dedc2cfdb0c01d306856b0a6b452d.tar.gz
scummvm-rg350-00452c40736dedc2cfdb0c01d306856b0a6b452d.tar.bz2
scummvm-rg350-00452c40736dedc2cfdb0c01d306856b0a6b452d.zip
Ooops
svn-id: r14992
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r--scumm/scumm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 1c51a4544f..701cc3810a 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -680,7 +680,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_skipProcessActors = 0;
_heSndSoundId = 0;
_heSndOffset = 0;
- _heSndTimer = 0;
+ _heSndChannel = 0;
_heSndLoop = 0;
_heSndSoundFreq = 0;
memset(_timers, 0, sizeof(_timers));
@@ -1417,7 +1417,7 @@ void ScummEngine::initScummVars() {
} else if (_version >= 7) {
VAR(VAR_V6_EMSSPACE) = 10000;
VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
- } else if (_heversion >= 71) {
+ } else if (_heversion >= 70) {
VAR(VAR_NUM_SOUND_CHANNELS) = 3;
VAR(VAR_MUSIC_CHANNEL) = 1;
VAR(VAR_SOUND_CHANNEL) = 2;