diff options
| author | Max Horn | 2003-05-20 11:56:36 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-20 11:56:36 +0000 |
| commit | 8d1110bfee983ad8e28f67564688eea872d8d4c1 (patch) | |
| tree | f305238feee60a02661677e1ee4d1a3dc5d2a392 /scumm/sound.cpp | |
| parent | e420517d027ad7d961088a27272eef939bb9e103 (diff) | |
| download | scummvm-rg350-8d1110bfee983ad8e28f67564688eea872d8d4c1.tar.gz scummvm-rg350-8d1110bfee983ad8e28f67564688eea872d8d4c1.tar.bz2 scummvm-rg350-8d1110bfee983ad8e28f67564688eea872d8d4c1.zip | |
init all Bundle members properly; make _voiceFile/_musicFile protected
svn-id: r7718
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 12d5633da9..ff496acd8a 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -1041,7 +1041,7 @@ void Sound::playBundleMusic(char *song) { char bunfile[20]; sprintf(bunfile, "musdisk%d.bun", _scumm->VAR(_scumm->VAR_CURRENTDISK)); if (_musicDisk != _scumm->VAR(_scumm->VAR_CURRENTDISK)) - _scumm->_bundle->_musicFile.close(); + _scumm->_bundle->closeMusicFile(); if (_scumm->_bundle->openMusicFile(bunfile, _scumm->getGameDataPath()) == false) { if (_scumm->_bundle->openMusicFile("music.bun", _scumm->getGameDataPath()) == false) { @@ -1226,7 +1226,7 @@ int Sound::playBundleSound(char *sound) { char voxfile[20]; sprintf(voxfile, "voxdisk%d.bun", _scumm->VAR(_scumm->VAR_CURRENTDISK)); if (_voiceDisk != _scumm->VAR(_scumm->VAR_CURRENTDISK)) - _scumm->_bundle->_voiceFile.close(); + _scumm->_bundle->closeVoiceFile(); result = _scumm->_bundle->openVoiceFile(voxfile, _scumm->getGameDataPath()); |