aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorColin Snover2017-05-29 23:29:41 -0500
committerColin Snover2017-06-09 22:47:54 -0500
commit06e82211ee38b0e63d81befed6b2cde9be4beba3 (patch)
tree9f9fa043da5e1019bcb51ab876e76b358b736420 /engines/sci
parent3bd579bdd4b5b406960db353436e2ab8642dfcf9 (diff)
downloadscummvm-rg350-06e82211ee38b0e63d81befed6b2cde9be4beba3.tar.gz
scummvm-rg350-06e82211ee38b0e63d81befed6b2cde9be4beba3.tar.bz2
scummvm-rg350-06e82211ee38b0e63d81befed6b2cde9be4beba3.zip
SCI: Implement Serializable for Object
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/engine/object.h2
-rw-r--r--engines/sci/engine/savegame.cpp6
2 files changed, 1 insertions, 7 deletions
diff --git a/engines/sci/engine/object.h b/engines/sci/engine/object.h
index 12387bcb09..8b597b42b0 100644
--- a/engines/sci/engine/object.h
+++ b/engines/sci/engine/object.h
@@ -67,7 +67,7 @@ enum ObjectOffsets {
kOffsetNamePointerSci11 = 16
};
-class Object {
+class Object : public Common::Serializable {
public:
Object() :
_name(NULL_REG),
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index a59b24010f..de891b559e 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -71,12 +71,6 @@ void syncWithSerializer(Common::Serializer &s, Common::Serializable &obj) {
obj.saveLoadWithSerializer(s);
}
-// FIXME: Object could implement Serializable to make use of the function
-// above.
-void syncWithSerializer(Common::Serializer &s, Object &obj) {
- obj.saveLoadWithSerializer(s);
-}
-
void syncWithSerializer(Common::Serializer &s, reg_t &obj) {
// Segment and offset are accessed directly here
s.syncAsUint16LE(obj._segment);