diff options
| author | Travis Howell | 2004-07-03 23:58:30 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-07-03 23:58:30 +0000 |
| commit | 0a287fa7f6a04f6ccf31b7fdf8accb28a70eefc0 (patch) | |
| tree | 9aa877b3c8c867517148d76acda7c9e3b744a332 | |
| parent | 7927f8574e0cab97c7ee7e9dfa4f6d124a359400 (diff) | |
| download | scummvm-rg350-0a287fa7f6a04f6ccf31b7fdf8accb28a70eefc0.tar.gz scummvm-rg350-0a287fa7f6a04f6ccf31b7fdf8accb28a70eefc0.tar.bz2 scummvm-rg350-0a287fa7f6a04f6ccf31b7fdf8accb28a70eefc0.zip | |
Initialise HE 7.0 sound vars
Enable VAR_NUM_GLOBAL_OBJS
svn-id: r14160
| -rw-r--r-- | scumm/scumm.cpp | 8 | ||||
| -rw-r--r-- | scumm/scumm.h | 1 | ||||
| -rw-r--r-- | scumm/vars.cpp | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 74ff1d2a0f..c91803f468 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -598,6 +598,12 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _2byteFontPtr = 0; _V1_talkingActor = 0; + _heSndSoundId = 0; + _heSndOffset = 0; + _heSndTimer = 0; + _heSndLoop = 0; + _heSndSoundFreq = 0; + // // Init all VARS to 0xFF // @@ -720,6 +726,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS VAR_BLAST_ABOVE_TEXT = 0xFF; VAR_VOICE_MODE = 0xFF; + VAR_NUM_GLOBAL_OBJS = 0xFF; // Use g_scumm from error() ONLY g_scumm = this; @@ -1286,6 +1293,7 @@ void ScummEngine::initScummVars() { VAR(VAR_LANGUAGE) = _language; } else if (_version >= 7) { VAR(VAR_V6_EMSSPACE) = 10000; + VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects; } else if (_heversion >= 72) { // TODO } else { diff --git a/scumm/scumm.h b/scumm/scumm.h index cd77f2cb7e..35dbf87638 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -1261,6 +1261,7 @@ public: byte VAR_BLAST_ABOVE_TEXT; byte VAR_VOICE_MODE; + byte VAR_NUM_GLOBAL_OBJS; }; // This is a constant lookup table of reverse bit masks diff --git a/scumm/vars.cpp b/scumm/vars.cpp index cbd53baf68..a54fac20bb 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -288,7 +288,7 @@ void ScummEngine_v7::setupScummVars() { VAR_NEW_ROOM = 35; VAR_WALKTO_OBJ = 36; - //VAR_NUM_GLOBAL_OBJS = 37; + VAR_NUM_GLOBAL_OBJS = 37; VAR_CAMERA_DEST_X = 38; VAR_CAMERA_DEST_Y = 39; |