diff options
Diffstat (limited to 'scumm/scumm.cpp')
| -rw-r--r-- | scumm/scumm.cpp | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index a89c675c1c..1c51a4544f 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -822,6 +822,10 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS VAR_MUSIC_BUNDLE_LOADED = 0xFF; VAR_VOICE_BUNDLE_LOADED = 0xFF; + VAR_NUM_SOUND_CHANNELS = 0xFF; + VAR_MUSIC_CHANNEL = 0xFF; + VAR_SOUND_CHANNEL = 0xFF; + VAR_NUM_ROOMS = 0xFF; VAR_NUM_SCRIPTS = 0xFF; VAR_NUM_SOUNDS = 0xFF; @@ -829,7 +833,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS VAR_NUM_IMAGES = 0xFF; VAR_NUM_CHARSETS = 0xFF; VAR_NUM_GLOBAL_OBJS = 0xFF; - VAR_NUM_SOUND_CHANNELS = 0xFF; + VAR_NUM_SPRITES = 0xFF; VAR_WINDOWS_VERSION = 0xFF; // Use g_scumm from error() ONLY @@ -1413,21 +1417,24 @@ void ScummEngine::initScummVars() { } else if (_version >= 7) { VAR(VAR_V6_EMSSPACE) = 10000; VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1; - } else if (_heversion >= 72) { + } else if (_heversion >= 71) { VAR(VAR_NUM_SOUND_CHANNELS) = 3; - - VAR(VAR_NUM_ROOMS) = _numRooms - 1; - VAR(VAR_NUM_SCRIPTS) = _numScripts - 1; - VAR(VAR_NUM_SOUNDS) = _numSounds - 1; - VAR(VAR_NUM_COSTUMES) = _numCostumes - 1; - VAR(VAR_NUM_IMAGES) = _numImages - 1; - VAR(VAR_NUM_CHARSETS) = _numCharsets - 1; - VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1; - + VAR(VAR_MUSIC_CHANNEL) = 1; + VAR(VAR_SOUND_CHANNEL) = 2; + + if (_heversion >= 72) { + VAR(VAR_NUM_ROOMS) = _numRooms - 1; + VAR(VAR_NUM_SCRIPTS) = _numScripts - 1; + VAR(VAR_NUM_SOUNDS) = _numSounds - 1; + VAR(VAR_NUM_COSTUMES) = _numCostumes - 1; + VAR(VAR_NUM_IMAGES) = _numImages - 1; + VAR(VAR_NUM_CHARSETS) = _numCharsets - 1; + VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1; + } if (_heversion >= 80) VAR(VAR_WINDOWS_VERSION) = 40; - } else if (_heversion >= 70) { - VAR(VAR_NUM_SOUND_CHANNELS) = 3; + if (_heversion >= 90) + VAR(VAR_NUM_SPRITES) = _numSprites - 1; } else { VAR(VAR_CURRENTDRIVE) = 0; switch (_midiDriver) { |