From 7b8f3021ac8f1bbc266f7e00c4a649830316fe24 Mon Sep 17 00:00:00 2001 From: md5 Date: Wed, 4 May 2011 10:52:36 +0300 Subject: TSAGE: Bumped up savegame version, so that the old savegames are still usable Savegames from revisions bf9b98f and 4f70162d are now version 2 savegames --- engines/tsage/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/tsage/saveload.h') diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index c45271b8fc..b1b98ce640 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -36,7 +36,7 @@ namespace tSage { typedef void (*SaveNotifierFn)(bool postFlag); -#define TSAGE_SAVEGAME_VERSION 1 +#define TSAGE_SAVEGAME_VERSION 2 class SavedObject; -- cgit v1.2.3 From 5c3b564e0b8fca3c1c4800aef9363f37805f4788 Mon Sep 17 00:00:00 2001 From: md5 Date: Wed, 4 May 2011 11:36:35 +0300 Subject: TSAGE: Now initializing the save game version properly --- engines/tsage/saveload.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'engines/tsage/saveload.h') diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index b1b98ce640..ec7cc7e496 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -68,6 +68,12 @@ class Serialiser : public Common::Serializer { public: Serialiser(Common::SeekableReadStream *in, Common::WriteStream *out) : Common::Serializer(in, out) {} + // HACK: TSAGE saved games contain a single byte for the savegame version, + // thus the normal syncVersion() Serializer member won't work here. In order + // to maintain compatibility with older game saves, this method is provided + // in order to set the savegame version from a byte + void setSaveVersion(byte version) { _version = version; } + void syncPointer(SavedObject **ptr, Common::Serializer::Version minVersion = 0, Common::Serializer::Version maxVersion = kLastVersion); void validate(const Common::String &s, Common::Serializer::Version minVersion = 0, -- cgit v1.2.3 From 3430a3f347c2430540bf3de17715e8fbc5d1a795 Mon Sep 17 00:00:00 2001 From: md5 Date: Wed, 4 May 2011 11:41:47 +0300 Subject: TSAGE: Switched to American English, after the relevant discussion on -devel: serialiser -> serializer synchronise -> synchronize --- engines/tsage/saveload.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'engines/tsage/saveload.h') diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index ec7cc7e496..8ec519a263 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -62,11 +62,11 @@ struct tSageSavegameHeader { if (s.isLoading()) FIELD = (TYPE)v_##FIELD; /** - * Derived serialiser class with extra synchronisation types + * Derived serializer class with extra synchronisation types */ -class Serialiser : public Common::Serializer { +class Serializer : public Common::Serializer { public: - Serialiser(Common::SeekableReadStream *in, Common::WriteStream *out) : Common::Serializer(in, out) {} + Serializer(Common::SeekableReadStream *in, Common::WriteStream *out) : Common::Serializer(in, out) {} // HACK: TSAGE saved games contain a single byte for the savegame version, // thus the normal syncVersion() Serializer member won't work here. In order @@ -87,13 +87,13 @@ public: class Serialisable { public: virtual ~Serialisable() {} - virtual void synchronise(Serialiser &s) = 0; + virtual void synchronize(Serializer &s) = 0; }; class SaveListener { public: virtual ~SaveListener() {} - virtual void listenerSynchronise(Serialiser &s) = 0; + virtual void listenerSynchronise(Serializer &s) = 0; }; /*--------------------------------------------------------------------------*/ @@ -104,7 +104,7 @@ public: virtual ~SavedObject(); virtual Common::String getClassName() { return "SavedObject"; } - virtual void synchronise(Serialiser &s) {} + virtual void synchronize(Serializer &s) {} static SavedObject *createInstance(const Common::String &className); }; @@ -117,7 +117,7 @@ public: template class SynchronisedList : public Common::List { public: - void synchronise(Serialiser &s) { + void synchronize(Serializer &s) { int entryCount; if (s.isLoading()) { -- cgit v1.2.3 From 340d08bc304bcc9315634f3c26486742b2dae0bb Mon Sep 17 00:00:00 2001 From: md5 Date: Wed, 4 May 2011 11:47:12 +0300 Subject: TSAGE: Some more conversions to US English --- engines/tsage/saveload.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/tsage/saveload.h') diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index 8ec519a263..cf7d087e6e 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -93,7 +93,7 @@ public: class SaveListener { public: virtual ~SaveListener() {} - virtual void listenerSynchronise(Serializer &s) = 0; + virtual void listenerSynchronize(Serializer &s) = 0; }; /*--------------------------------------------------------------------------*/ @@ -115,7 +115,7 @@ public: * Derived list class with extra functionality */ template -class SynchronisedList : public Common::List { +class SynchronizedList : public Common::List { public: void synchronize(Serializer &s) { int entryCount; -- cgit v1.2.3 From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001 From: strangerke Date: Thu, 12 May 2011 01:13:57 +0200 Subject: GIT: Clean up: Suppress SVN tags, now useless --- engines/tsage/saveload.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'engines/tsage/saveload.h') diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index cf7d087e6e..611e5b3d04 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TSAGE_SAVELOAD_H -- cgit v1.2.3 From aaf2c0e6ebe373afd06cbf8ebca334710a4ed15d Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 13 May 2011 11:46:03 +0200 Subject: TSAGE: Fix warning when compiling in release mode --- engines/tsage/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/tsage/saveload.h') diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index 611e5b3d04..a04bba2773 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -115,7 +115,7 @@ template class SynchronizedList : public Common::List { public: void synchronize(Serializer &s) { - int entryCount; + int entryCount = 0; if (s.isLoading()) { this->clear(); -- cgit v1.2.3 From 38d787676fbf904069c88cd015ee6c47d451b14b Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 15 May 2011 21:56:07 +1000 Subject: TSAGE: Fixed saving problem and talking to Seeker in Scene #50 --- engines/tsage/saveload.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/tsage/saveload.h') diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h index a04bba2773..51b7696590 100644 --- a/engines/tsage/saveload.h +++ b/engines/tsage/saveload.h @@ -33,7 +33,7 @@ namespace tSage { typedef void (*SaveNotifierFn)(bool postFlag); -#define TSAGE_SAVEGAME_VERSION 2 +#define TSAGE_SAVEGAME_VERSION 3 class SavedObject; -- cgit v1.2.3