diff options
| -rw-r--r-- | saveload.cpp | 40 | ||||
| -rw-r--r-- | saveload.h | 40 | ||||
| -rw-r--r-- | sound/imuse.cpp | 1 |
3 files changed, 41 insertions, 40 deletions
diff --git a/saveload.cpp b/saveload.cpp index d8029d2259..2741373918 100644 --- a/saveload.cpp +++ b/saveload.cpp @@ -35,46 +35,6 @@ struct SaveGameHeader { 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 :) diff --git a/saveload.h b/saveload.h index 3076a49626..70253734ac 100644 --- a/saveload.h +++ b/saveload.h @@ -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; @@ -48,4 +54,38 @@ struct SerializerStream { #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 diff --git a/sound/imuse.cpp b/sound/imuse.cpp index d480eabe92..62e79027c2 100644 --- a/sound/imuse.cpp +++ b/sound/imuse.cpp @@ -24,6 +24,7 @@ #include "fmopl.h" #include "mididrv.h" #include "imuse.h" +#include "saveload.h" /* * Some constants |