[Scummvm-cvs-logs] SF.net SVN: scummvm: [22113] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 22113
Author:   fingolfin
Date:     2006-04-23 10:47:40 -0700 (Sun, 23 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22113&view=rev

Log Message:
-----------
Change some uses of ScummFile to the more generic BaseScummFile

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h
    scummvm/trunk/engines/scumm/smush/chunk.cpp
    scummvm/trunk/engines/scumm/smush/chunk.h
    scummvm/trunk/engines/scumm/sound.cpp
    scummvm/trunk/engines/scumm/sound.h
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h	2006-04-23 17:39:31 UTC (rev 22112)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.h	2006-04-23 17:47:40 UTC (rev 22113)
@@ -27,7 +27,7 @@
 
 namespace Scumm {
 
-class ScummFile;
+class BaseScummFile;
 
 class BundleDirCache {
 public:
@@ -80,7 +80,7 @@
 	int _numFiles;
 	int _numCompItems;
 	int _curSample;
-	ScummFile *_file;
+	BaseScummFile *_file;
 	bool _compTableLoaded;
 	int _fileBundleId;
 	byte _compOutput[0x2000];

Modified: scummvm/trunk/engines/scumm/smush/chunk.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/chunk.cpp	2006-04-23 17:39:31 UTC (rev 22112)
+++ scummvm/trunk/engines/scumm/smush/chunk.cpp	2006-04-23 17:47:40 UTC (rev 22113)
@@ -87,7 +87,7 @@
 	return true;
 }
 
-FileChunk::FileChunk(ScummFile *data, int offset) {
+FileChunk::FileChunk(BaseScummFile *data, int offset) {
 	_data = data;
 	_deleteData = false;
 

Modified: scummvm/trunk/engines/scumm/smush/chunk.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/chunk.h	2006-04-23 17:39:31 UTC (rev 22112)
+++ scummvm/trunk/engines/scumm/smush/chunk.h	2006-04-23 17:47:40 UTC (rev 22113)
@@ -28,7 +28,7 @@
 
 namespace Scumm {
 
-class ScummFile;
+class BaseScummFile;
 
 class Chunk {
 public:
@@ -70,11 +70,11 @@
 
 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();

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2006-04-23 17:39:31 UTC (rev 22112)
+++ scummvm/trunk/engines/scumm/sound.cpp	2006-04-23 17:47:40 UTC (rev 22113)
@@ -975,7 +975,7 @@
 	}
 }
 
-ScummFile *Sound::openSfxFile() {
+BaseScummFile *Sound::openSfxFile() {
 	struct SoundFileExtensions {
 		const char *ext;
 		SoundMode mode;

Modified: scummvm/trunk/engines/scumm/sound.h
===================================================================
--- scummvm/trunk/engines/scumm/sound.h	2006-04-23 17:39:31 UTC (rev 22112)
+++ scummvm/trunk/engines/scumm/sound.h	2006-04-23 17:47:40 UTC (rev 22113)
@@ -34,7 +34,7 @@
 namespace Scumm {
 
 class ScummEngine;
-class ScummFile;
+class BaseScummFile;
 
 struct MP3OffsetTable;
 struct SaveLoadEntry;
@@ -71,7 +71,7 @@
 		int16 flags;
 	} _soundQue2[10];
 
-	ScummFile *_sfxFile;
+	BaseScummFile *_sfxFile;
 	SoundMode _soundMode;
 	MP3OffsetTable *_offsetTable;	// For compressed audio
 	int _numSoundEffects;		// For compressed audio
@@ -161,7 +161,7 @@
 	void saveLoadWithSerializer(Serializer *ser);
 
 protected:
-	ScummFile *openSfxFile();
+	BaseScummFile *openSfxFile();
 	bool isSfxFinished() const;
 	void processSfxQueues();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.