[Scummvm-cvs-logs] CVS: scummvm/sword2 build_display.cpp,1.73,1.74 resman.cpp,1.111,1.112 resman.h,1.26,1.27 sound.cpp,1.58,1.59 sound.h,1.19,1.20 startup.cpp,1.49,1.50 sword2.cpp,1.142,1.143

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17315/sword2

Modified Files:
	build_display.cpp resman.cpp resman.h sound.cpp sound.h 
	startup.cpp sword2.cpp 
Log Message:
Moved class File and the MD5 stuff to namespace Common

Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/build_display.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- build_display.cpp	2 May 2005 09:20:27 -0000	1.73
+++ build_display.cpp	10 May 2005 22:56:22 -0000	1.74
@@ -698,7 +698,7 @@
 	//     now, let's just the standard speech font instead.
 
 	SpriteInfo spriteInfo;
-	File f;
+	Common::File f;
 	int i;
 
 	// Read the "Smacker" logo

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- resman.cpp	8 May 2005 13:05:31 -0000	1.111
+++ resman.cpp	10 May 2005 22:56:23 -0000	1.112
@@ -68,7 +68,7 @@
 	// within the clusters at this point it makes no difference. We only
 	// wish to know what resource files there are and what is in each
 
-	File file;
+	Common::File file;
 	uint32 size;
 	byte *temp;
 
@@ -418,7 +418,7 @@
 		// care which CD it's on. But if we can't find it, keep asking
 		// for the CD until we do.
 
-		File *file = openCluFile(cluFileNum);
+		Common::File *file = openCluFile(cluFileNum);
 
 		if (_resFiles[cluFileNum].entryTab == NULL) {
 			// we didn't read from this file before, get its index table
@@ -443,7 +443,7 @@
 			StandardHeader *header = (StandardHeader *) _resList[res].ptr;
 			char buf[256];
 			const char *tag;
-			File out;
+			Common::File out;
 
 			switch (header->fileType) {
 			case ANIMATION_FILE:
@@ -497,7 +497,7 @@
 #endif
 
 			if (!out.exists(buf, "")) {
-				if (out.open(buf, File::kFileWriteMode, ""))
+				if (out.open(buf, Common::File::kFileWriteMode, ""))
 					out.write(_resList[res].ptr, len);
 			}
 		}
@@ -563,8 +563,8 @@
 		_cacheEnd = res;
 }
 
-File *ResourceManager::openCluFile(uint16 fileNum) {
-	File *file = new File;
+Common::File *ResourceManager::openCluFile(uint16 fileNum) {
+	Common::File *file = new Common::File;
 	while (!file->open(_resFiles[fileNum].fileName)) {
 		// HACK: We have to check for this, or it'll be impossible to
 		// quit while the game is asking for the user to insert a CD.
@@ -585,7 +585,7 @@
 	return file;
 }
 
-void ResourceManager::readCluIndex(uint16 fileNum, File *file) {
+void ResourceManager::readCluIndex(uint16 fileNum, Common::File *file) {
 	if (_resFiles[fileNum].entryTab == NULL) {
 		// we didn't read from this file before, get its index table
 		if (file == NULL)

Index: resman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- resman.h	22 Feb 2005 07:37:50 -0000	1.26
+++ resman.h	10 May 2005 22:56:24 -0000	1.27
@@ -21,7 +21,9 @@
 #ifndef	RESMAN_H
 #define	RESMAN_H
 
-class File;
+namespace Common {
+	class File;
+}
 
 #define MAX_MEM_CACHE (8 * 1024 * 1024) // we keep up to 8 megs of resource data files in memory
 #define	MAX_res_files 20
@@ -54,8 +56,8 @@
 
 class ResourceManager {
 private:
-	File *openCluFile(uint16 fileNum);
-	void readCluIndex(uint16 fileNum, File *file = NULL);
+	Common::File *openCluFile(uint16 fileNum);
+	void readCluIndex(uint16 fileNum, Common::File *file = NULL);
 	void removeFromCacheList(Resource *res);
 	void addToCacheList(Resource *res);
 	void checkMemUsage();

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- sound.cpp	12 Mar 2005 18:56:08 -0000	1.58
+++ sound.cpp	10 May 2005 22:56:24 -0000	1.59
@@ -53,14 +53,14 @@
 	for (i = 0; i < MAXMUS; i++) {
 		_music[i] = NULL;
 
-		_musicFile[i].file = new File;
+		_musicFile[i].file = new Common::File;
 		_musicFile[i].idxTab = NULL;
 		_musicFile[i].idxLen = 0;
 		_musicFile[i].fileSize = 0;
 		_musicFile[i].fileType = 0;
 		_musicFile[i].inUse = false;
 
-		_speechFile[i].file = new File;
+		_speechFile[i].file = new Common::File;
 		_speechFile[i].idxTab = NULL;
 		_speechFile[i].idxLen = 0;
 		_speechFile[i].fileSize = 0;

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sound.h	12 Mar 2005 18:56:09 -0000	1.19
+++ sound.h	10 May 2005 22:56:24 -0000	1.20
@@ -80,7 +80,7 @@
 
 class CLUInputStream : public AudioStream {
 private:
-	File *_file;
+	Common::File *_file;
 	bool _firstTime;
 	uint32 _file_pos;
 	uint32 _end_pos;
@@ -98,7 +98,7 @@
 	}
 
 public:
-	CLUInputStream(File *file, int size);
+	CLUInputStream(Common::File *file, int size);
 	~CLUInputStream();
 
 	int readBuffer(int16 *buffer, const int numSamples);
@@ -109,7 +109,7 @@
 };
 
 struct SoundFileHandle {
-	File *file;
+	Common::File *file;
 	uint32 *idxTab;
 	uint32 idxLen;
 	uint32 fileSize;
@@ -120,7 +120,7 @@
 class MusicInputStream : public AudioStream {
 private:
 	int _cd;
-	//File *_file;
+	//Common::File *_file;
 	SoundFileHandle *_fh;
 	uint32 _musicId;
 	AudioStream *_decoder;
@@ -201,7 +201,7 @@
 	SoundHandle _soundHandleSpeech;
 
 	MusicInputStream *_music[MAXMUS];
-	//File _musicFile[MAXMUS];
+	//Common::File _musicFile[MAXMUS];
 	SoundFileHandle _musicFile[MAXMUS];
 	SoundFileHandle _speechFile[MAXMUS];
 

Index: startup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/startup.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- startup.cpp	9 Apr 2005 13:08:00 -0000	1.49
+++ startup.cpp	10 May 2005 22:56:24 -0000	1.50
@@ -40,7 +40,7 @@
 	// We query each in turn and setup an array of start structures.
 	// If the file doesn't exist then we say so and return a 0.
 
-	File fp;
+	Common::File fp;
 
 	// ok, load in the master screen manager file
 

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- sword2.cpp	2 May 2005 05:41:01 -0000	1.142
+++ sword2.cpp	10 May 2005 22:56:25 -0000	1.143
@@ -109,12 +109,12 @@
 
 Sword2Engine::Sword2Engine(GameDetector *detector, OSystem *syst) : Engine(syst) {
 	// Add default file directories
-	File::addDefaultDirectory(_gameDataPath + "CLUSTERS/");
-	File::addDefaultDirectory(_gameDataPath + "SWORD2/");
-	File::addDefaultDirectory(_gameDataPath + "VIDEO/");
-	File::addDefaultDirectory(_gameDataPath + "clusters/");
-	File::addDefaultDirectory(_gameDataPath + "sword2/");
-	File::addDefaultDirectory(_gameDataPath + "video/");
+	Common::File::addDefaultDirectory(_gameDataPath + "CLUSTERS/");
+	Common::File::addDefaultDirectory(_gameDataPath + "SWORD2/");
+	Common::File::addDefaultDirectory(_gameDataPath + "VIDEO/");
+	Common::File::addDefaultDirectory(_gameDataPath + "clusters/");
+	Common::File::addDefaultDirectory(_gameDataPath + "sword2/");
+	Common::File::addDefaultDirectory(_gameDataPath + "video/");
 
 	_features = detector->_game.features;
 	_targetName = detector->_targetName;