diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /common/serializer.h | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'common/serializer.h')
| -rw-r--r-- | common/serializer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/serializer.h b/common/serializer.h index b874624d38..5b08a9a9fa 100644 --- a/common/serializer.h +++ b/common/serializer.h @@ -68,15 +68,15 @@ public: static const Version kLastVersion = 0xFFFFFFFF; protected: - Common::SeekableReadStream *_loadStream; - Common::WriteStream *_saveStream; + SeekableReadStream *_loadStream; + WriteStream *_saveStream; uint _bytesSynced; Version _version; public: - Serializer(Common::SeekableReadStream *in, Common::WriteStream *out) + Serializer(SeekableReadStream *in, WriteStream *out) : _loadStream(in), _saveStream(out), _bytesSynced(0), _version(0) { assert(in || out); } @@ -214,7 +214,7 @@ public: * Sync a C-string, by treating it as a zero-terminated byte sequence. * @todo Replace this method with a special Syncer class for Common::String */ - void syncString(Common::String &str, Version minVersion = 0, Version maxVersion = kLastVersion) { + void syncString(String &str, Version minVersion = 0, Version maxVersion = kLastVersion) { if (_version < minVersion || _version > maxVersion) return; // Ignore anything which is not supposed to be present in this save game version |