[Scummvm-cvs-logs] CVS: scummvm/simon icons.cpp,1.4,1.5 midi.cpp,1.68,1.69 midi.h,1.28,1.29 res.cpp,1.31,1.32 simon.cpp,1.502,1.503 simon.h,1.137,1.138 sound.cpp,1.83,1.84 sound.h,1.23,1.24

[Max Horn]

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

Modified Files:
	icons.cpp midi.cpp midi.h res.cpp simon.cpp simon.h sound.cpp 
	sound.h 
Log Message:
Moved class File and the MD5 stuff to namespace Common

Index: icons.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/icons.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- icons.cpp	6 May 2005 11:37:33 -0000	1.4
+++ icons.cpp	10 May 2005 22:56:15 -0000	1.5
@@ -29,7 +29,7 @@
 namespace Simon {
 
 void SimonEngine::loadIconFile() {
-	File in;
+	Common::File in;
 	if (_game & GF_ACORN)
 		in.open("ICONDATA");
 	else if (_game & GF_AMIGA)

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- midi.cpp	3 Apr 2005 22:01:26 -0000	1.68
+++ midi.cpp	10 May 2005 22:56:16 -0000	1.69
@@ -335,7 +335,7 @@
 	17256, 5103, 8794, 4884, 16
 };
 
-void MidiPlayer::loadSMF (File *in, int song, bool sfx) {
+void MidiPlayer::loadSMF (Common::File *in, int song, bool sfx) {
 	Common::StackLock lock(_mutex);
 
 	MusicInfo *p = sfx ? &_sfx : &_music;
@@ -409,7 +409,7 @@
 	p->parser = parser; // That plugs the power cord into the wall
 }
 
-void MidiPlayer::loadMultipleSMF (File *in, bool sfx) {
+void MidiPlayer::loadMultipleSMF (Common::File *in, bool sfx) {
 	// This is a special case for Simon 2 Windows.
 	// Instead of having multiple sequences as
 	// separate tracks in a Type 2 file, simon2win
@@ -465,7 +465,7 @@
 	}
 }
 
-void MidiPlayer::loadXMIDI(File *in, bool sfx) {
+void MidiPlayer::loadXMIDI(Common::File *in, bool sfx) {
 	Common::StackLock lock(_mutex);
 	MusicInfo *p = sfx ? &_sfx : &_music;
 	clearConstructs(*p);
@@ -512,7 +512,7 @@
 	p->parser = parser; // That plugs the power cord into the wall
 }
 
-void MidiPlayer::loadS1D (File *in, bool sfx) {
+void MidiPlayer::loadS1D (Common::File *in, bool sfx) {
 	Common::StackLock lock(_mutex);
 	MusicInfo *p = sfx ? &_sfx : &_music;
 	clearConstructs(*p);

Index: midi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- midi.h	28 Jan 2005 22:05:46 -0000	1.28
+++ midi.h	10 May 2005 22:56:16 -0000	1.29
@@ -26,7 +26,9 @@
 #include "sound/midiparser.h"
 #include "common/mutex.h"
 
-class File;
+namespace Common {
+	class File;
+}
 
 namespace Simon {
 
@@ -83,10 +85,10 @@
 	MidiPlayer (OSystem *system);
 	virtual ~MidiPlayer();
 
-	void loadSMF (File *in, int song, bool sfx = false);
-	void loadMultipleSMF (File *in, bool sfx = false);
-	void loadXMIDI (File *in, bool sfx = false);
-	void loadS1D (File *in, bool sfx = false);
+	void loadSMF (Common::File *in, int song, bool sfx = false);
+	void loadMultipleSMF (Common::File *in, bool sfx = false);
+	void loadXMIDI (Common::File *in, bool sfx = false);
+	void loadS1D (Common::File *in, bool sfx = false);
 
 	void mapMT32toGM (bool map);
 	void setLoop (bool loop);

Index: res.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/res.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- res.cpp	6 May 2005 11:37:33 -0000	1.31
+++ res.cpp	10 May 2005 22:56:16 -0000	1.32
@@ -97,7 +97,7 @@
 };
 
 void SimonEngine::loadGamePcFile(const char *filename) {
-	File in;
+	Common::File in;
 	int num_inited_objects;
 	int i, file_size;
 
@@ -164,7 +164,7 @@
 	in.close();
 }
 
-void SimonEngine::readGamePcText(File *in) {
+void SimonEngine::readGamePcText(Common::File *in) {
 	uint text_size;
 	byte *text_mem;
 
@@ -178,7 +178,7 @@
 	setupStringTable(text_mem, _stringTabNum);
 }
 
-void SimonEngine::readItemFromGamePc(File *in, Item *item) {
+void SimonEngine::readItemFromGamePc(Common::File *in, Item *item) {
 	uint32 type;
 
 	item->unk2 = in->readUint16BE();
@@ -199,7 +199,7 @@
 	}
 }
 
-void SimonEngine::readItemChildren(File *in, Item *item, uint type) {
+void SimonEngine::readItemChildren(Common::File *in, Item *item, uint type) {
 	if (type == 1) {
 		uint fr1 = in->readUint16BE();
 		uint fr2 = in->readUint16BE();
@@ -246,14 +246,14 @@
 	}
 }
 
-uint fileReadItemID(File *in) {
+uint fileReadItemID(Common::File *in) {
 	uint32 val = in->readUint32BE();
 	if (val == 0xFFFFFFFF)
 		return 0;
 	return val + 2;
 }
 
-byte *SimonEngine::readSingleOpcode(File *in, byte *ptr) {
+byte *SimonEngine::readSingleOpcode(Common::File *in, byte *ptr) {
 	int i, l;
 	const char *string_ptr;
 	uint val;

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -d -r1.502 -r1.503
--- simon.cpp	9 May 2005 12:08:24 -0000	1.502
+++ simon.cpp	10 May 2005 22:56:16 -0000	1.503
@@ -46,6 +46,8 @@
 #include "globals.h"
 #endif
 
+using Common::File;
+
 struct SimonGameSettings {
 	const char *name;
 	const char *description;
@@ -128,7 +130,7 @@
 	for (StringSet::const_iterator iter = fileSet.begin(); iter != fileSet.end(); ++iter) {
 		uint8 md5sum[16];
 		const char *name = iter->_key.c_str();
-		if (md5_file(name, md5sum)) {
+		if (Common::md5_file(name, md5sum)) {
 			char md5str[32+1];
 			for (int j = 0; j < 16; j++) {
 				sprintf(md5str + j*2, "%02x", (int)md5sum[j]);
@@ -317,7 +319,7 @@
 		if (f.isOpen() == false)
 			strcat(buf, ".");
 		
-		if (md5_file(buf, md5sum)) {
+		if (Common::md5_file(buf, md5sum)) {
 			char md5str[32+1];
 			for (int j = 0; j < 16; j++) {
 				sprintf(md5str + j*2, "%02x", (int)md5sum[j]);

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- simon.h	6 May 2005 13:22:47 -0000	1.137
+++ simon.h	10 May 2005 22:56:17 -0000	1.138
@@ -36,7 +36,7 @@
 //#define DUMP_FILE_NR 8
 //#define DUMP_BITMAPS_FILE_NR 8
 
-uint fileReadItemID(File *in);
+uint fileReadItemID(Common::File *in);
 
 #define CHECK_BOUNDS(x, y) assert((uint)(x) < ARRAYSIZE(y))
 #define NUM_PALETTE_FADEOUT 32
@@ -138,7 +138,7 @@
 		FORMAT_VOC
 	} SoundFormat;
 
-	File *_gameFile;
+	Common::File *_gameFile;
 	
 	byte *_strippedTxtMem;
 	uint _textSize;
@@ -376,15 +376,15 @@
 	virtual ~SimonEngine();
 
 protected:
-	int allocGamePcVars(File *in);
+	int allocGamePcVars(Common::File *in);
 	void loginPlayerHelper(Item *item, int a, int b);
 	void loginPlayer();
 	void allocateStringTable(int num);
 	void setupStringTable(byte *mem, int num);
 	void setupLocalStringTable(byte *mem, int num);
-	void readGamePcText(File *in);
-	void readItemChildren(File *in, Item *item, uint tmp);
-	void readItemFromGamePc(File *in, Item *item);
+	void readGamePcText(Common::File *in);
+	void readItemChildren(Common::File *in, Item *item, uint tmp);
+	void readItemFromGamePc(Common::File *in, Item *item);
 	void loadGamePcFile(const char *filename);
 
 	byte *allocateItem(uint size);
@@ -398,11 +398,11 @@
 	void allocTablesHeap();
 
 	Subroutine *createSubroutine(uint a);
-	void readSubroutine(File *in, Subroutine *sub);
+	void readSubroutine(Common::File *in, Subroutine *sub);
 	SubroutineLine *createSubroutineLine(Subroutine *sub, int a);
-	void readSubroutineLine(File *in, SubroutineLine *new_table, Subroutine *sub);
-	byte *readSingleOpcode(File *in, byte *ptr);
-	void readSubroutineBlock(File *in);
+	void readSubroutineLine(Common::File *in, SubroutineLine *new_table, Subroutine *sub);
+	byte *readSingleOpcode(Common::File *in, byte *ptr);
+	void readSubroutineBlock(Common::File *in);
 
 	Subroutine *getSubroutineByID(uint subroutine_id);
 
@@ -524,14 +524,14 @@
 
 
 	uint loadTextFile(const char *filename, byte *dst);
-	File *openTablesFile(const char *filename);
-	void closeTablesFile(File *in);
+	Common::File *openTablesFile(const char *filename);
+	void closeTablesFile(Common::File *in);
 
 	uint loadTextFile_simon1(const char *filename, byte *dst);
-	File *openTablesFile_simon1(const char *filename);
+	Common::File *openTablesFile_simon1(const char *filename);
 
 	uint loadTextFile_gme(const char *filename, byte *dst);
-	File *openTablesFile_gme(const char *filename);
+	Common::File *openTablesFile_gme(const char *filename);
 
 	void invokeTimeEvent(TimeEvent *te);
 	bool kickoffTimeEvents();

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- sound.cpp	8 May 2005 12:33:25 -0000	1.83
+++ sound.cpp	10 May 2005 22:56:18 -0000	1.84
@@ -30,6 +30,8 @@
 #include "sound/vorbis.h"
 #include "sound/wave.h"
 
+using Common::File;
+
 namespace Simon {
 
 #define SOUND_BIG_ENDIAN true

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- sound.h	8 May 2005 12:33:25 -0000	1.23
+++ sound.h	10 May 2005 22:56:18 -0000	1.24
@@ -57,7 +57,7 @@
 	~Sound();
 	
 	void readSfxFile(const char *filename);
-	void loadSfxTable(File *gameFile, uint32 base);
+	void loadSfxTable(Common::File *gameFile, uint32 base);
 	void readVoiceFile(const char *filename);
 
 	void playVoice(uint sound);