diff options
| author | Max Horn | 2006-02-20 16:51:30 +0000 |
|---|---|---|
| committer | Max Horn | 2006-02-20 16:51:30 +0000 |
| commit | e389bcf497391cf4cde7d7b7a6f4023877205735 (patch) | |
| tree | b8314b1ad8bc19117c37df4d4ce27d9cce92a442 /engines/scumm/imuse_digi/dimuse_sndmgr.cpp | |
| parent | a6e5f6fd2cdb574e09fb3bd120b1e8efa034f0cb (diff) | |
| download | scummvm-rg350-e389bcf497391cf4cde7d7b7a6f4023877205735.tar.gz scummvm-rg350-e389bcf497391cf4cde7d7b7a6f4023877205735.tar.bz2 scummvm-rg350-e389bcf497391cf4cde7d7b7a6f4023877205735.zip | |
Replaced _gameId, _version, _heversion, _features, _midi, _platform with a simple ScummGameSettings instance: _game
svn-id: r20795
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse_sndmgr.cpp')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index 6adef74ab7..61d625ec0a 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -273,8 +273,8 @@ bool ImuseDigiSndMgr::openMusicBundle(soundStruct *sound, int disk) { sound->bundle = new BundleMgr(_cacheBundleDir); assert(sound->bundle); - if (_vm->_gameId == GID_CMI) { - if (_vm->_features & GF_DEMO) { + if (_vm->_game.id == GID_CMI) { + if (_vm->_game.features & GF_DEMO) { result = sound->bundle->open("music.bun", sound->compressed); } else { char musicfile[20]; @@ -293,7 +293,7 @@ bool ImuseDigiSndMgr::openMusicBundle(soundStruct *sound, int disk) { // FIXME: Shouldn't we only set _disk if result == true? _disk = (byte)_vm->VAR(_vm->VAR_CURRENTDISK); } - } else if (_vm->_gameId == GID_DIG) + } else if (_vm->_game.id == GID_DIG) result = sound->bundle->open("digmusic.bun", sound->compressed, true); else error("ImuseDigiSndMgr::openMusicBundle() Don't know which bundle file to load"); @@ -308,8 +308,8 @@ bool ImuseDigiSndMgr::openVoiceBundle(soundStruct *sound, int disk) { sound->bundle = new BundleMgr(_cacheBundleDir); assert(sound->bundle); - if (_vm->_gameId == GID_CMI) { - if (_vm->_features & GF_DEMO) { + if (_vm->_game.id == GID_CMI) { + if (_vm->_game.features & GF_DEMO) { result = sound->bundle->open("voice.bun", sound->compressed); } else { char voxfile[20]; @@ -328,7 +328,7 @@ bool ImuseDigiSndMgr::openVoiceBundle(soundStruct *sound, int disk) { // FIXME: Shouldn't we only set _disk if result == true? _disk = (byte)_vm->VAR(_vm->VAR_CURRENTDISK); } - } else if (_vm->_gameId == GID_DIG) + } else if (_vm->_game.id == GID_DIG) result = sound->bundle->open("digvoice.bun", sound->compressed); else error("ImuseDigiSndMgr::openVoiceBundle() Don't know which bundle file to load"); @@ -347,7 +347,7 @@ ImuseDigiSndMgr::soundStruct *ImuseDigiSndMgr::openSound(int32 soundId, const ch error("ImuseDigiSndMgr::openSound() can't alloc free sound slot"); } - const bool header_outside = ((_vm->_gameId == GID_CMI) && !(_vm->_features & GF_DEMO)); + const bool header_outside = ((_vm->_game.id == GID_CMI) && !(_vm->_game.features & GF_DEMO)); bool result = false; byte *ptr = NULL; @@ -579,7 +579,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(soundStruct *soundHandle, int region, b } int header_size = soundHandle->offsetData; - bool header_outside = ((_vm->_gameId == GID_CMI) && !(_vm->_features & GF_DEMO)); + bool header_outside = ((_vm->_game.id == GID_CMI) && !(_vm->_game.features & GF_DEMO)); if ((soundHandle->bundle) && (!soundHandle->compressed)) { size = soundHandle->bundle->decompressSampleByCurIndex(start + offset, size, buf, header_size, header_outside); } else if (soundHandle->resPtr) { |