thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TSAGE: Add missing calls to inherited method in various class synchronisation methods

Browse source
This commit is contained in:
Paul Gilbert 2011-05-03 20:31:51 +10:00
parent 4f70162d94
commit bf9b98f316
4 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/tsage/converse.cpp
View file

@ -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);

6
engines/tsage/core.cpp
View file

@ -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);

1
engines/tsage/globals.cpp
View file

@ -101,6 +101,7 @@ void Globals::reset() {
}
void Globals::synchronise(Serialiser &s) {
SavedObject::synchronise(s);
assert(_gfxManagers.size() == 1);
_sceneItems.synchronise(s);

2
engines/tsage/ringworld_logic.cpp
View file

@ -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);