[Scummvm-cvs-logs] CVS: scummvm saveload.h,1.1,1.2 saveload.cpp,1.52,1.53

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv629

Modified Files:
	saveload.h saveload.cpp 
Log Message:
fixed compilation of imuse.cpp

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- saveload.h	2 Jul 2002 20:57:27 -0000	1.1
+++ saveload.h	4 Jul 2002 10:05:40 -0000	1.2
@@ -22,6 +22,12 @@
 #ifndef SAVELOAD_H
 #define SAVELOAD_H
 
+struct SaveLoadEntry {
+	uint32 offs;
+	uint8 type;
+	uint8 size;
+};
+
 struct SerializerStream {
 #ifdef NONSTANDARD_SAVE
 	void *context;
@@ -46,6 +52,40 @@
 		return ::fwrite(buf, size, cnt, out);
 	}
 #endif
+};
+
+typedef int SerializerSaveReference(void *me, byte type, void *ref);
+typedef void *SerializerLoadReference(void *me, byte type, int ref);
+
+struct Serializer {
+	SerializerStream _saveLoadStream;
+
+	union {
+		SerializerSaveReference *_save_ref;
+		SerializerLoadReference *_load_ref;
+		void *_saveload_ref;
+	};
+	void *_ref_me;
+
+	bool _saveOrLoad;
+
+	void saveLoadBytes(void *b, int len);
+	void saveLoadArrayOf(void *b, int len, int datasize, byte filetype);
+	void saveLoadEntries(void *d, const SaveLoadEntry *sle);
+	void saveLoadArrayOf(void *b, int num, int datasize, const SaveLoadEntry *sle);
+
+	void saveUint32(uint32 d);
+	void saveWord(uint16 d);
+	void saveByte(byte b);
+
+	byte loadByte();
+	uint16 loadWord();
+	uint32 loadUint32();
+
+	bool isSaving() { return _saveOrLoad; }
+
+	bool checkEOFLoadStream();
+
 };
 
 #endif

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- saveload.cpp	2 Jul 2002 20:57:27 -0000	1.52
+++ saveload.cpp	4 Jul 2002 10:05:40 -0000	1.53
@@ -35,46 +35,6 @@
 	char name[32];
 };
 
-struct SaveLoadEntry {
-	uint32 offs;
-	uint8 type;
-	uint8 size;
-};
-
-typedef int SerializerSaveReference(void *me, byte type, void *ref);
-typedef void *SerializerLoadReference(void *me, byte type, int ref);
-
-struct Serializer {
-	SerializerStream _saveLoadStream;
-
-	union {
-		SerializerSaveReference *_save_ref;
-		SerializerLoadReference *_load_ref;
-		void *_saveload_ref;
-	};
-	void *_ref_me;
-
-	bool _saveOrLoad;
-
-	void saveLoadBytes(void *b, int len);
-	void saveLoadArrayOf(void *b, int len, int datasize, byte filetype);
-	void saveLoadEntries(void *d, const SaveLoadEntry *sle);
-	void saveLoadArrayOf(void *b, int num, int datasize, const SaveLoadEntry *sle);
-
-	void saveUint32(uint32 d);
-	void saveWord(uint16 d);
-	void saveByte(byte b);
-
-	byte loadByte();
-	uint16 loadWord();
-	uint32 loadUint32();
-
-	bool isSaving() { return _saveOrLoad; }
-
-	bool checkEOFLoadStream();
-
-};
-
 // Support for "old" savegames (made with 2501 CVS build)
 // Can be useful for other ports too :)