libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-02 23:49:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match original games, only the music file is essential in COMI.

Browse Source 
svn-id: r18728
This commit is contained in:
Travis Howell 2005-09-02 01:41:53 +00:00
parent efae5f30ea
commit a33603e0eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/imuse_digi/dimuse_bndmgr.h
View File

@ -83,7 +83,7 @@ public:
BundleMgr(BundleDirCache *_cache); BundleMgr(BundleDirCache *_cache);
~BundleMgr(); ~BundleMgr();
bool open(const char *filename, bool &compressed, bool errorFlag=true); bool open(const char *filename, bool &compressed, bool errorFlag=false);
void close(); void close();
Common::File *getFile(const char *filename, int32 &offset, int32 &size); Common::File *getFile(const char *filename, int32 &offset, int32 &size);
int32 decompressSampleByName(const char *name, int32 offset, int32 size, byte **comp_final, bool header_outside); int32 decompressSampleByName(const char *name, int32 offset, int32 size, byte **comp_final, bool header_outside);

6
scumm/imuse_digi/dimuse_sndmgr.cpp
View File

@ -265,7 +265,7 @@ bool ImuseDigiSndMgr::openMusicBundle(soundStruct *sound, int disk) {
sound->bundle = new BundleMgr(_cacheBundleDir); sound->bundle = new BundleMgr(_cacheBundleDir);
if (_vm->_gameId == GID_CMI) { if (_vm->_gameId == GID_CMI) {
if (_vm->_features & GF_DEMO) { if (_vm->_features & GF_DEMO) {
result = sound->bundle->open("music.bun", sound->compressed, false); result = sound->bundle->open("music.bun", sound->compressed);
} else { } else {
char musicfile[20]; char musicfile[20];
if (disk == -1) if (disk == -1)
@ -278,13 +278,13 @@ bool ImuseDigiSndMgr::openMusicBundle(soundStruct *sound, int disk) {
// sound->bundle->closeFile(); // sound->bundle->closeFile();
// } // }
result = sound->bundle->open(musicfile, sound->compressed); result = sound->bundle->open(musicfile, sound->compressed, true);
// FIXME: Shouldn't we only set _disk if result == true? // FIXME: Shouldn't we only set _disk if result == true?
_disk = (byte)_vm->VAR(_vm->VAR_CURRENTDISK); _disk = (byte)_vm->VAR(_vm->VAR_CURRENTDISK);
} }
} else if (_vm->_gameId == GID_DIG) } else if (_vm->_gameId == GID_DIG)
result = sound->bundle->open("digmusic.bun", sound->compressed); result = sound->bundle->open("digmusic.bun", sound->compressed, true);
else else
error("ImuseDigiSndMgr::openMusicBundle() Don't know which bundle file to load"); error("ImuseDigiSndMgr::openMusicBundle() Don't know which bundle file to load");