diff options
| author | Paweł Kołodziejski | 2004-07-04 06:14:18 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-07-04 06:14:18 +0000 |
| commit | 11d552ff7e799a64dacab81909a1cb09d5099567 (patch) | |
| tree | 79091ff29995f9a2325508beec70366ae3aff7c0 | |
| parent | fedc852ba4e41e6b75b1102c53455bda2147bac9 (diff) | |
| download | scummvm-rg350-11d552ff7e799a64dacab81909a1cb09d5099567.tar.gz scummvm-rg350-11d552ff7e799a64dacab81909a1cb09d5099567.tar.bz2 scummvm-rg350-11d552ff7e799a64dacab81909a1cb09d5099567.zip | |
added code for bundle script vars
svn-id: r14166
| -rw-r--r-- | scumm/imuse_digi/dimuse_sndmgr.cpp | 10 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | scumm/vars.cpp | 8 |
4 files changed, 18 insertions, 4 deletions
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp index 94ebc7e03b..8e164d0262 100644 --- a/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -249,6 +249,11 @@ bool ImuseDigiSndMgr::openMusicBundle(soundStruct *sound, int disk) { else error("ImuseDigiSndMgr::openMusicBundle() Don't know which bundle file to load"); + if (result) + _vm->VAR(_vm->VAR_MUSIC_BUNDLE_LOADED) = 1; + else + _vm->VAR(_vm->VAR_MUSIC_BUNDLE_LOADED) = 0; + return result; } @@ -283,6 +288,11 @@ bool ImuseDigiSndMgr::openVoiceBundle(soundStruct *sound, int disk) { else error("ImuseDigiSndMgr::openVoiceBundle() Don't know which bundle file to load"); + if (result) + _vm->VAR(_vm->VAR_VOICE_BUNDLE_LOADED) = 1; + else + _vm->VAR(_vm->VAR_VOICE_BUNDLE_LOADED) = 0; + return result; } diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 57c212a11f..98c69325f8 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -727,6 +727,8 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS VAR_BLAST_ABOVE_TEXT = 0xFF; VAR_VOICE_MODE = 0xFF; VAR_NUM_GLOBAL_OBJS = 0xFF; + VAR_MUSIC_BUNDLE_LOADED = 0xFF; + VAR_VOICE_BUNDLE_LOADED = 0xFF; // Use g_scumm from error() ONLY g_scumm = this; diff --git a/scumm/scumm.h b/scumm/scumm.h index 35dbf87638..50e8cc8d3b 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -1262,6 +1262,8 @@ public: byte VAR_BLAST_ABOVE_TEXT; byte VAR_VOICE_MODE; byte VAR_NUM_GLOBAL_OBJS; + byte VAR_MUSIC_BUNDLE_LOADED; + byte VAR_VOICE_BUNDLE_LOADED; }; // This is a constant lookup table of reverse bit masks diff --git a/scumm/vars.cpp b/scumm/vars.cpp index a54fac20bb..dbc584bf1c 100644 --- a/scumm/vars.cpp +++ b/scumm/vars.cpp @@ -348,8 +348,8 @@ void ScummEngine_v7::setupScummVars() { VAR_STRING2DRAW = 130; - //VAR_MUSIC_BUNDLE_LOADED = 135; - //VAR_VOICE_BUNDLE_LOADED = 136; + VAR_MUSIC_BUNDLE_LOADED = 135; + VAR_VOICE_BUNDLE_LOADED = 136; } @@ -394,8 +394,8 @@ void ScummEngine_v8::setupScummVars() { VAR_LANGUAGE = 41; VAR_CURRENTDISK = 42; - //VAR_MUSIC_BUNDLE_LOADED = 45; - //VAR_VOICE_BUNDLE_LOADED = 46; + VAR_MUSIC_BUNDLE_LOADED = 45; + VAR_VOICE_BUNDLE_LOADED = 46; VAR_SCROLL_SCRIPT = 50; VAR_ENTRY_SCRIPT = 51; |