aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2011-05-03 20:31:51 +1000
committerPaul Gilbert2011-05-03 20:31:51 +1000
commitbf9b98f3162d36936f465e804682ca41515d2f09 (patch)
tree6c406f076ad1a7e6cb147812375fd7acd84eef38
parent4f70162d94bf4a7a18e0b42e48bbdabf39cb84f8 (diff)
downloadscummvm-rg350-bf9b98f3162d36936f465e804682ca41515d2f09.tar.gz
scummvm-rg350-bf9b98f3162d36936f465e804682ca41515d2f09.tar.bz2
scummvm-rg350-bf9b98f3162d36936f465e804682ca41515d2f09.zip
TSAGE: Add missing calls to inherited method in various class synchronisation methods
-rw-r--r--engines/tsage/converse.cpp4
-rw-r--r--engines/tsage/core.cpp6
-rw-r--r--engines/tsage/globals.cpp1
-rw-r--r--engines/tsage/ringworld_logic.cpp2
4 files changed, 13 insertions, 0 deletions
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 82420b2bd8..8e36acf2b6 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -590,6 +590,8 @@ void StripManager::load() {
}
void StripManager::synchronise(Serialiser &s) {
+ Action::synchronise(s);
+
s.syncAsSint32LE(_stripNum);
s.syncAsSint32LE(_obj44Index);
s.syncAsSint32LE(_field20);
@@ -802,6 +804,8 @@ Speaker::Speaker() : EventHandler() {
}
void Speaker::synchronise(Serialiser &s) {
+ EventHandler::synchronise(s);
+
_fieldA.synchronise(s);
SYNC_POINTER(_field18);
s.syncString(_speakerName);
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 51f472a4f7..5a6969f856 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -925,6 +925,7 @@ bool PlayerMover::sub_F8E5(const Common::Point &pt1, const Common::Point &pt2, c
/*--------------------------------------------------------------------------*/
void PlayerMover2::synchronise(Serialiser &s) {
+ PlayerMover::synchronise(s);
SYNC_POINTER(_destObject);
s.syncAsSint16LE(_maxArea);
s.syncAsSint16LE(_minArea);
@@ -1342,6 +1343,8 @@ void ScenePalette::changeBackground(const Rect &bounds, FadeMode fadeMode) {
}
void ScenePalette::synchronise(Serialiser &s) {
+ SavedObject::synchronise(s);
+
s.syncBytes(_palette, 256 * 3);
s.syncAsSint32LE(_colors.foreground);
s.syncAsSint32LE(_colors.background);
@@ -2496,6 +2499,7 @@ void SceneObjectList::deactivate() {
}
void SceneObjectList::synchronise(Serialiser &s) {
+ SavedObject::synchronise(s);
_objList.synchronise(s);
}
@@ -3418,6 +3422,8 @@ void GameHandler::execute() {
}
void GameHandler::synchronise(Serialiser &s) {
+ EventHandler::synchronise(s);
+
_lockCtr.synchronise(s);
_waitCtr.synchronise(s);
s.syncAsSint16LE(_nextWaitCtr);
diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 3914d77185..10db2e9c5d 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -101,6 +101,7 @@ void Globals::reset() {
}
void Globals::synchronise(Serialiser &s) {
+ SavedObject::synchronise(s);
assert(_gfxManagers.size() == 1);
_sceneItems.synchronise(s);
diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp
index c0cfe3a938..204f798f81 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld_logic.cpp
@@ -320,6 +320,8 @@ void SceneArea::wait() {
}
void SceneArea::synchronise(Serialiser &s) {
+ SavedObject::synchronise(s);
+
s.syncAsSint16LE(_pt.x);
s.syncAsSint16LE(_pt.y);
s.syncAsSint32LE(_resNum);