[Scummvm-cvs-logs] scummvm master -> bf9b98f3162d36936f465e804682ca41515d2f09
dreammaster
dreammaster at scummvm.org
Tue May 3 12:34:53 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
bf9b98f316 TSAGE: Add missing calls to inherited method in various class synchronisation methods
Commit: bf9b98f3162d36936f465e804682ca41515d2f09
https://github.com/scummvm/scummvm/commit/bf9b98f3162d36936f465e804682ca41515d2f09
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-05-03T03:31:51-07:00
Commit Message:
TSAGE: Add missing calls to inherited method in various class synchronisation methods
Changed paths:
engines/tsage/converse.cpp
engines/tsage/core.cpp
engines/tsage/globals.cpp
engines/tsage/ringworld_logic.cpp
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 82420b2..8e36acf 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 51f472a..5a6969f 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 3914d77..10db2e9 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 c0cfe3a..204f798 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);
More information about the Scummvm-git-logs
mailing list