diff options
| author | Travis Howell | 2004-09-10 10:45:22 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-09-10 10:45:22 +0000 |
| commit | 00452c40736dedc2cfdb0c01d306856b0a6b452d (patch) | |
| tree | 689a90d852f255bedef18551a744b3eb86522f74 | |
| parent | 98f8433396aaecb8bc23f13566b6cb9ac383c201 (diff) | |
| download | scummvm-rg350-00452c40736dedc2cfdb0c01d306856b0a6b452d.tar.gz scummvm-rg350-00452c40736dedc2cfdb0c01d306856b0a6b452d.tar.bz2 scummvm-rg350-00452c40736dedc2cfdb0c01d306856b0a6b452d.zip | |
Ooops
svn-id: r14992
| -rw-r--r-- | scumm/scumm.cpp | 4 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 |
2 files changed, 3 insertions, 3 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; diff --git a/scumm/scumm.h b/scumm/scumm.h index e04eb24c98..d58cf7783e 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -1052,7 +1052,7 @@ public: byte _proc_special_palette[256]; byte _roomPalette[256]; byte *_shadowPalette; - int _heSndSoundFreq, _heSndOffset, _heSndTimer, _heSndSoundId, _heSndLoop; + int _heSndSoundFreq, _heSndOffset, _heSndChannel, _heSndSoundId, _heSndLoop; bool _skipDrawObject, _skipProcessActors; int _timers[4]; |