Change some uses of ScummFile to the more generic BaseScummFile

svn-id: r22113

5 files changed, 10 insertions, 10 deletions

diff --git a/engines/scumm/imuse_digi/dimuse_bndmgr.h b/engines/scumm/imuse_digi/dimuse_bndmgr.h
index 2b419bbcc0..e9d0f264d3 100644
--- a/engines/scumm/imuse_digi/dimuse_bndmgr.h
+++ b/engines/scumm/imuse_digi/dimuse_bndmgr.h
@@ -27,7 +27,7 @@
 
 namespace Scumm {
 
-class ScummFile;
+class BaseScummFile;
 
 class BundleDirCache {
 public:
@@ -80,7 +80,7 @@ private:
 	int _numFiles;
 	int _numCompItems;
 	int _curSample;
-	ScummFile *_file;
+	BaseScummFile *_file;
 	bool _compTableLoaded;
 	int _fileBundleId;
 	byte _compOutput[0x2000];
diff --git a/engines/scumm/smush/chunk.cpp b/engines/scumm/smush/chunk.cpp
index fd0abb8079..a1c87fb912 100644
--- a/engines/scumm/smush/chunk.cpp
+++ b/engines/scumm/smush/chunk.cpp
@@ -87,7 +87,7 @@ bool BaseChunk::seek(int32 delta, seek_type dir) {
 	return true;
 }
 
-FileChunk::FileChunk(ScummFile *data, int offset) {
+FileChunk::FileChunk(BaseScummFile *data, int offset) {
 	_data = data;
 	_deleteData = false;
 
diff --git a/engines/scumm/smush/chunk.h b/engines/scumm/smush/chunk.h
index be7bb365a3..9c910dfb23 100644
--- a/engines/scumm/smush/chunk.h
+++ b/engines/scumm/smush/chunk.h
@@ -28,7 +28,7 @@
 
 namespace Scumm {
 
-class ScummFile;
+class BaseScummFile;
 
 class Chunk {
 public:
@@ -70,11 +70,11 @@ public:
 
 class FileChunk : public BaseChunk {
 private:
-	ScummFile *_data;
+	BaseScummFile *_data;
 	bool _deleteData;
 	uint32 _offset;
 
-	FileChunk(ScummFile *data, int offset);
+	FileChunk(BaseScummFile *data, int offset);
 public:
 	FileChunk(const Common::String &name, int offset = 0);
 	virtual ~FileChunk();
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index df9041b34d..2e92798b92 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -975,7 +975,7 @@ void Sound::pauseSounds(bool pause) {
 	}
 }
 
-ScummFile *Sound::openSfxFile() {
+BaseScummFile *Sound::openSfxFile() {
 	struct SoundFileExtensions {
 		const char *ext;
 		SoundMode mode;
diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h
index 7e365e576e..70268051b4 100644
--- a/engines/scumm/sound.h
+++ b/engines/scumm/sound.h
@@ -34,7 +34,7 @@ namespace Common {
 namespace Scumm {
 
 class ScummEngine;
-class ScummFile;
+class BaseScummFile;
 
 struct MP3OffsetTable;
 struct SaveLoadEntry;
@@ -71,7 +71,7 @@ protected:
 		int16 flags;
 	} _soundQue2[10];
 
-	ScummFile *_sfxFile;
+	BaseScummFile *_sfxFile;
 	SoundMode _soundMode;
 	MP3OffsetTable *_offsetTable;	// For compressed audio
 	int _numSoundEffects;		// For compressed audio
@@ -161,7 +161,7 @@ public:
 	void saveLoadWithSerializer(Serializer *ser);
 
 protected:
-	ScummFile *openSfxFile();
+	BaseScummFile *openSfxFile();
 	bool isSfxFinished() const;
 	void processSfxQueues();