thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added code for bundle script vars

Browse source 
svn-id: r14166
This commit is contained in:
Paweł Kołodziejski 2004-07-04 06:14:18 +00:00
parent fedc852ba4
commit 11d552ff7e
4 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scumm/imuse_digi/dimuse_sndmgr.cpp
View file

@ -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;
}

2
scumm/scumm.cpp
View file

@ -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;

2
scumm/scumm.h
View file

@ -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

8
scumm/vars.cpp
View file

@ -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;