diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /common/serializer.h | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
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 |