Converted the Cruise engine to use the new Common::Serializer class
svn-id: r39443
This commit is contained in:
parent
52d6f3323b
commit
57b0038e5e
2 changed files with 19 additions and 83 deletions
|
@ -27,74 +27,9 @@
|
|||
#define CRUISE_SAVELOAD_H
|
||||
|
||||
#include "common/scummsys.h"
|
||||
#include "common/savefile.h"
|
||||
|
||||
namespace Cruise {
|
||||
|
||||
/* TODO: This code is copied verbatim from the Tinsel engine, and in turn was derived from
|
||||
* the SCUMM engine. As such it should probably be brought into the common codebase
|
||||
*/
|
||||
#define SYNC_AS(SUFFIX,TYPE,SIZE) \
|
||||
template <class T> \
|
||||
void syncAs ## SUFFIX(T &val) { \
|
||||
if (_loadStream) \
|
||||
val = static_cast<T>(_loadStream->read ## SUFFIX()); \
|
||||
else { \
|
||||
TYPE tmp = val; \
|
||||
_saveStream->write ## SUFFIX(tmp); \
|
||||
} \
|
||||
_bytesSynced += SIZE; \
|
||||
}
|
||||
|
||||
|
||||
class Serializer {
|
||||
public:
|
||||
Serializer(Common::SeekableReadStream *in, Common::OutSaveFile *out)
|
||||
: _loadStream(in), _saveStream(out), _bytesSynced(0) {
|
||||
assert(in || out);
|
||||
}
|
||||
|
||||
bool isSaving() { return (_saveStream != 0); }
|
||||
bool isLoading() { return (_loadStream != 0); }
|
||||
|
||||
uint bytesSynced() const { return _bytesSynced; }
|
||||
|
||||
void syncBytes(byte *buf, uint16 size) {
|
||||
if (_loadStream)
|
||||
_loadStream->read(buf, size);
|
||||
else
|
||||
_saveStream->write(buf, size);
|
||||
_bytesSynced += size;
|
||||
}
|
||||
|
||||
void syncString(char *buf, uint16 size) {
|
||||
syncBytes((byte *)buf, size);
|
||||
}
|
||||
|
||||
SYNC_AS(Byte, byte, 1)
|
||||
|
||||
SYNC_AS(Uint16LE, uint16, 2)
|
||||
SYNC_AS(Uint16BE, uint16, 2)
|
||||
SYNC_AS(Sint16LE, int16, 2)
|
||||
SYNC_AS(Sint16BE, int16, 2)
|
||||
|
||||
SYNC_AS(Uint32LE, uint32, 4)
|
||||
SYNC_AS(Uint32BE, uint32, 4)
|
||||
SYNC_AS(Sint32LE, int32, 4)
|
||||
SYNC_AS(Sint32BE, int32, 4)
|
||||
|
||||
protected:
|
||||
Common::SeekableReadStream *_loadStream;
|
||||
Common::OutSaveFile *_saveStream;
|
||||
|
||||
uint _bytesSynced;
|
||||
};
|
||||
|
||||
#undef SYNC_AS
|
||||
|
||||
|
||||
|
||||
|
||||
int saveSavegameData(int saveGameIdx);
|
||||
int loadSavegameData(int saveGameIdx);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue