aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
diff options
context:
space:
mode:
authorMax Horn2010-11-23 22:25:10 +0000
committerMax Horn2010-11-23 22:25:10 +0000
commit54e0390752b299d739daaf211e6b84b485738ada (patch)
treeb4ebfb49d0921d75b8d0719435607896cfe9d994 /engines/scumm/imuse_digi/dimuse_sndmgr.cpp
parent55e3ed001624df8b8222a1556a371aec8aab4983 (diff)
downloadscummvm-rg350-54e0390752b299d739daaf211e6b84b485738ada.tar.gz
scummvm-rg350-54e0390752b299d739daaf211e6b84b485738ada.tar.bz2
scummvm-rg350-54e0390752b299d739daaf211e6b84b485738ada.zip
SCUMM: Replace Common::File uses by SeekableReadStream and SearchMan
svn-id: r54434
Diffstat (limited to 'engines/scumm/imuse_digi/dimuse_sndmgr.cpp')
-rw-r--r--engines/scumm/imuse_digi/dimuse_sndmgr.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index 1d4769a7f5..4054843163 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -93,7 +93,7 @@ void ImuseDigiSndMgr::countElements(byte *ptr, int &numRegions, int &numJumps, i
} while (tag != MKID_BE('DATA'));
}
-void ImuseDigiSndMgr::prepareSoundFromRMAP(Common::File *file, SoundDesc *sound, int32 offset, int32 size) {
+void ImuseDigiSndMgr::prepareSoundFromRMAP(Common::SeekableReadStream *file, SoundDesc *sound, int32 offset, int32 size) {
int l;
file->seek(offset, SEEK_SET);
@@ -428,7 +428,7 @@ ImuseDigiSndMgr::SoundDesc *ImuseDigiSndMgr::openSound(int32 soundId, const char
char fileName[24];
int32 offset = 0, size = 0;
sprintf(fileName, "%s.map", soundName);
- Common::File *rmapFile = sound->bundle->getFile(fileName, offset, size);
+ Common::SeekableReadStream *rmapFile = sound->bundle->getFile(fileName, offset, size);
if (!rmapFile) {
closeSound(sound);
return NULL;
@@ -666,7 +666,7 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte
sprintf(fileName, "%s_reg%03d", soundDesc->name, region);
if (scumm_stricmp(fileName, soundDesc->lastFileName) != 0) {
int32 offs = 0, len = 0;
- Common::File *cmpFile;
+ Common::SeekableReadStream *cmpFile;
uint8 soundMode = 0;
sprintf(fileName, "%s_reg%03d.fla", soundDesc->name, region);