diff options
author | md5 | 2011-05-04 11:41:47 +0300 |
---|---|---|
committer | md5 | 2011-05-04 11:41:47 +0300 |
commit | 3430a3f347c2430540bf3de17715e8fbc5d1a795 (patch) | |
tree | 19d02dbcfc3210fcbb33fa88012b36b2bf3d2092 /engines | |
parent | 5c3b564e0b8fca3c1c4800aef9363f37805f4788 (diff) | |
download | scummvm-rg350-3430a3f347c2430540bf3de17715e8fbc5d1a795.tar.gz scummvm-rg350-3430a3f347c2430540bf3de17715e8fbc5d1a795.tar.bz2 scummvm-rg350-3430a3f347c2430540bf3de17715e8fbc5d1a795.zip |
TSAGE: Switched to American English, after the relevant discussion on -devel:
serialiser -> serializer
synchronise -> synchronize
Diffstat (limited to 'engines')
27 files changed, 194 insertions, 194 deletions
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp index 84c2089471..319807bdb0 100644 --- a/engines/tsage/converse.cpp +++ b/engines/tsage/converse.cpp @@ -52,9 +52,9 @@ void SequenceManager::setup() { _sceneObject = _objectList[0]; } -void SequenceManager::synchronise(Serialiser &s) { +void SequenceManager::synchronize(Serializer &s) { if (s.getVersion() >= 2) - Action::synchronise(s); + Action::synchronize(s); s.syncAsSint32LE(_resNum); s.syncAsSint32LE(_sequenceOffset); @@ -512,12 +512,12 @@ void Obj44::load(const byte *dataP) { _speakerOffset = READ_LE_UINT16(dataP + 0x42); } -void Obj44::synchronise(Serialiser &s) { +void Obj44::synchronize(Serializer &s) { s.syncAsSint32LE(_id); for (int idx = 0; idx < OBJ44_LIST_SIZE; ++idx) s.syncAsSint32LE(_field2[idx]); for (int idx = 0; idx < OBJ44_LIST_SIZE; ++idx) - _list[idx].synchronise(s); + _list[idx].synchronize(s); s.syncAsUint32LE(_speakerOffset); } @@ -590,15 +590,15 @@ void StripManager::load() { DEALLOCATE(obj44List); } -void StripManager::synchronise(Serialiser &s) { +void StripManager::synchronize(Serializer &s) { if (s.getVersion() >= 2) - Action::synchronise(s); + Action::synchronize(s); s.syncAsSint32LE(_stripNum); s.syncAsSint32LE(_obj44Index); s.syncAsSint32LE(_field20); s.syncAsSint32LE(_sceneNumber); - _sceneBounds.synchronise(s); + _sceneBounds.synchronize(s); SYNC_POINTER(_activeSpeaker); s.syncAsByte(_textShown); s.syncAsByte(_field2E6); @@ -610,7 +610,7 @@ void StripManager::synchronise(Serialiser &s) { if (s.isLoading()) _obj44List.resize(arrSize); for (int i = 0; i < arrSize; ++i) - _obj44List[i].synchronise(s); + _obj44List[i].synchronize(s); // Synhcronise script data int scriptSize = _script.size(); @@ -805,16 +805,16 @@ Speaker::Speaker() : EventHandler() { _speakerName = "SPEAKER"; } -void Speaker::synchronise(Serialiser &s) { +void Speaker::synchronize(Serializer &s) { if (s.getVersion() >= 2) - EventHandler::synchronise(s); + EventHandler::synchronize(s); - _fieldA.synchronise(s); + _fieldA.synchronize(s); SYNC_POINTER(_field18); s.syncString(_speakerName); s.syncAsSint32LE(_newSceneNumber); s.syncAsSint32LE(_oldSceneNumber); - _sceneBounds.synchronise(s); + _sceneBounds.synchronize(s); s.syncAsSint32LE(_textWidth); s.syncAsSint16LE(_textPos.x); s.syncAsSint16LE(_textPos.y); s.syncAsSint32LE(_fontNumber); diff --git a/engines/tsage/converse.h b/engines/tsage/converse.h index fd2abcd872..f8c5bc7b14 100644 --- a/engines/tsage/converse.h +++ b/engines/tsage/converse.h @@ -58,7 +58,7 @@ public: SequenceManager(); virtual Common::String getClassName() { return "SequenceManager"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void remove(); virtual void signal(); virtual void process(Event &event); @@ -86,7 +86,7 @@ public: Speaker(); virtual Common::String getClassName() { return "Speaker"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void remove(); virtual void proc12(Action *action); virtual void setText(const Common::String &msg); @@ -168,7 +168,7 @@ public: int _id; uint _scriptOffset; - virtual void synchronise(Serialiser &s) { + virtual void synchronize(Serializer &s) { s.syncAsSint32LE(_id); s.syncAsUint32LE(_scriptOffset); } @@ -184,7 +184,7 @@ public: uint _speakerOffset; public: void load(const byte *dataP); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); }; class StripManager : public Action { @@ -212,7 +212,7 @@ public: StripManager(); virtual ~StripManager(); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void remove(); virtual void signal(); virtual void process(Event &event); diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index cdebc8b77f..bd33b1b9d3 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -73,8 +73,8 @@ InvObjectList::InvObjectList() { _selectedItem = NULL; } -void InvObjectList::synchronise(Serialiser &s) { - SavedObject::synchronise(s); +void InvObjectList::synchronize(Serializer &s) { + SavedObject::synchronize(s); SYNC_POINTER(_selectedItem); } @@ -108,8 +108,8 @@ Action::Action() { _attached = false; } -void Action::synchronise(Serialiser &s) { - EventHandler::synchronise(s); +void Action::synchronize(Serializer &s) { + EventHandler::synchronize(s); if (s.getVersion() == 1) remove(); @@ -182,8 +182,8 @@ ObjectMover::~ObjectMover() { _sceneObject->_mover = NULL; } -void ObjectMover::synchronise(Serialiser &s) { - EventHandler::synchronise(s); +void ObjectMover::synchronize(Serializer &s) { + EventHandler::synchronize(s); s.syncAsSint16LE(_destPosition.x); s.syncAsSint16LE(_destPosition.y); s.syncAsSint16LE(_moveDelta.x); s.syncAsSint16LE(_moveDelta.y); @@ -328,8 +328,8 @@ ObjectMover2::ObjectMover2() : ObjectMover() { _destObject = NULL; } -void ObjectMover2::synchronise(Serialiser &s) { - ObjectMover::synchronise(s); +void ObjectMover2::synchronize(Serializer &s) { + ObjectMover::synchronize(s); SYNC_POINTER(_destObject); s.syncAsSint32LE(_minArea); @@ -404,8 +404,8 @@ void NpcMover::startMove(SceneObject *sceneObj, va_list va) { /*--------------------------------------------------------------------------*/ -void PlayerMover::synchronise(Serialiser &s) { - NpcMover::synchronise(s); +void PlayerMover::synchronize(Serializer &s) { + NpcMover::synchronize(s); s.syncAsSint16LE(_finalDest.x); s.syncAsSint16LE(_finalDest.y); s.syncAsSint32LE(_routeIndex); @@ -926,9 +926,9 @@ bool PlayerMover::sub_F8E5(const Common::Point &pt1, const Common::Point &pt2, c /*--------------------------------------------------------------------------*/ -void PlayerMover2::synchronise(Serialiser &s) { +void PlayerMover2::synchronize(Serializer &s) { if (s.getVersion() >= 2) - PlayerMover::synchronise(s); + PlayerMover::synchronize(s); SYNC_POINTER(_destObject); s.syncAsSint16LE(_maxArea); s.syncAsSint16LE(_minArea); @@ -978,8 +978,8 @@ void PaletteModifierCached::setPalette(ScenePalette *palette, int step) { _percent = 100; } -void PaletteModifierCached::synchronise(Serialiser &s) { - PaletteModifier::synchronise(s); +void PaletteModifierCached::synchronize(Serializer &s) { + PaletteModifier::synchronize(s); s.syncAsByte(_step); s.syncAsSint32LE(_percent); @@ -993,8 +993,8 @@ PaletteRotation::PaletteRotation() : PaletteModifierCached() { _frameNumber = _globals->_events.getFrameNumber(); } -void PaletteRotation::synchronise(Serialiser &s) { - PaletteModifierCached::synchronise(s); +void PaletteRotation::synchronize(Serializer &s) { + PaletteModifierCached::synchronize(s); s.syncAsSint32LE(_delayCtr); s.syncAsUint32LE(_frameNumber); @@ -1122,8 +1122,8 @@ void PaletteRotation::setDelay(int amount) { /*--------------------------------------------------------------------------*/ -void PaletteFader::synchronise(Serialiser &s) { - PaletteModifierCached::synchronise(s); +void PaletteFader::synchronize(Serializer &s) { + PaletteModifierCached::synchronize(s); s.syncAsSint16LE(_step); s.syncAsSint16LE(_percent); @@ -1348,9 +1348,9 @@ void ScenePalette::changeBackground(const Rect &bounds, FadeMode fadeMode) { tempPalette._listeners.clear(); } -void ScenePalette::synchronise(Serialiser &s) { +void ScenePalette::synchronize(Serializer &s) { if (s.getVersion() >= 2) - SavedObject::synchronise(s); + SavedObject::synchronize(s); s.syncBytes(_palette, 256 * 3); s.syncAsSint32LE(_colors.foreground); @@ -1367,10 +1367,10 @@ void ScenePalette::synchronise(Serialiser &s) { /*--------------------------------------------------------------------------*/ -void SceneItem::synchronise(Serialiser &s) { - EventHandler::synchronise(s); +void SceneItem::synchronize(Serializer &s) { + EventHandler::synchronize(s); - _bounds.synchronise(s); + _bounds.synchronize(s); s.syncString(_msg); s.syncAsSint32LE(_fieldE); s.syncAsSint32LE(_field10); @@ -1601,8 +1601,8 @@ void NamedHotspot::setup(int ys, int xs, int ye, int xe, const int resnum, const _globals->_sceneItems.addItems(this, NULL); } -void NamedHotspot::synchronise(Serialiser &s) { - SceneHotspot::synchronise(s); +void NamedHotspot::synchronize(Serializer &s) { + SceneHotspot::synchronize(s); s.syncAsSint16LE(_resnum); s.syncAsSint16LE(_lookLineNum); s.syncAsSint16LE(_useLineNum); @@ -1616,8 +1616,8 @@ void SceneObjectWrapper::setSceneObject(SceneObject *so) { so->_flags |= OBJFLAG_PANES; } -void SceneObjectWrapper::synchronise(Serialiser &s) { - EventHandler::synchronise(s); +void SceneObjectWrapper::synchronize(Serializer &s) { + EventHandler::synchronize(s); SYNC_POINTER(_sceneObject); } @@ -2014,8 +2014,8 @@ int SceneObject::getSpliceArea(const SceneObject *obj) { return (xd * xd + yd) / 2; } -void SceneObject::synchronise(Serialiser &s) { - SceneHotspot::synchronise(s); +void SceneObject::synchronize(Serializer &s) { + SceneHotspot::synchronize(s); s.syncAsUint32LE(_updateStartFrame); s.syncAsUint32LE(_walkStartFrame); @@ -2026,8 +2026,8 @@ void SceneObject::synchronise(Serialiser &s) { s.syncAsUint32LE(_flags); s.syncAsSint16LE(_xs); s.syncAsSint16LE(_xe); - _paneRects[0].synchronise(s); - _paneRects[1].synchronise(s); + _paneRects[0].synchronize(s); + _paneRects[1].synchronize(s); s.syncAsSint32LE(_visage); SYNC_POINTER(_objectWrapper); s.syncAsSint32LE(_strip); @@ -2505,10 +2505,10 @@ void SceneObjectList::deactivate() { } } -void SceneObjectList::synchronise(Serialiser &s) { +void SceneObjectList::synchronize(Serializer &s) { if (s.getVersion() >= 2) - SavedObject::synchronise(s); - _objList.synchronise(s); + SavedObject::synchronize(s); + _objList.synchronize(s); } /*--------------------------------------------------------------------------*/ @@ -2550,8 +2550,8 @@ void SceneText::setup(const Common::String &msg) { gfxMan.deactivate(); } -void SceneText::synchronise(Serialiser &s) { - SceneObject::synchronise(s); +void SceneText::synchronize(Serializer &s) { + SceneObject::synchronize(s); s.syncAsSint16LE(_fontNumber); s.syncAsSint16LE(_width); @@ -2669,8 +2669,8 @@ void Player::process(Event &event) { } } -void Player::synchronise(Serialiser &s) { - SceneObject::synchronise(s); +void Player::synchronize(Serializer &s) { + SceneObject::synchronize(s); s.syncAsByte(_canWalk); s.syncAsByte(_uiEnabled); @@ -3429,12 +3429,12 @@ void GameHandler::execute() { } } -void GameHandler::synchronise(Serialiser &s) { +void GameHandler::synchronize(Serializer &s) { if (s.getVersion() >= 2) - EventHandler::synchronise(s); + EventHandler::synchronize(s); - _lockCtr.synchronise(s); - _waitCtr.synchronise(s); + _lockCtr.synchronize(s); + _waitCtr.synchronize(s); s.syncAsSint16LE(_nextWaitCtr); s.syncAsSint16LE(_field14); } @@ -3627,7 +3627,7 @@ void SceneHandler::dispatchObject(EventHandler *obj) { obj->dispatch(); } -void SceneHandler::saveListener(Serialiser &ser) { +void SceneHandler::saveListener(Serializer &ser) { warning("TODO: SceneHandler::saveListener"); } diff --git a/engines/tsage/core.h b/engines/tsage/core.h index 45a39b24bb..d58340dfe6 100644 --- a/engines/tsage/core.h +++ b/engines/tsage/core.h @@ -47,7 +47,7 @@ class SceneObject; class SceneObjectList; class ObjectMover; class Action; -class Serialiser; +class Serializer; class InvObject : public SavedObject { public: @@ -66,7 +66,7 @@ public: void setCursor(); virtual Common::String getClassName() { return "InvObject"; } - virtual void synchronise(Serialiser &s) { + virtual void synchronize(Serializer &s) { s.syncAsUint16LE(_sceneNumber); } }; @@ -79,7 +79,7 @@ public: InvObjectList(); virtual Common::String getClassName() { return "InvObjectList"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); }; /*--------------------------------------------------------------------------*/ @@ -105,7 +105,7 @@ public: int incCtr() { return ++_ctr; } int getCtr() const { return _ctr; } - virtual void synchronise(Serialiser &s) { s.syncAsSint16LE(_ctr); } + virtual void synchronize(Serializer &s) { s.syncAsSint16LE(_ctr); } }; class EventHandler : public SavedObject { @@ -115,7 +115,7 @@ public: EventHandler() : SavedObject() { _action = NULL; } virtual ~EventHandler() { destroy(); } - virtual void synchronise(Serialiser &s) { SYNC_POINTER(_action); } + virtual void synchronize(Serializer &s) { SYNC_POINTER(_action); } virtual Common::String getClassName() { return "EventHandler"; } virtual void postInit(SceneObjectList *OwnerList = NULL) {} virtual void remove() {} @@ -138,7 +138,7 @@ public: Action(); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "Action"; } virtual void remove(); virtual void process(Event &event); @@ -175,7 +175,7 @@ public: ObjectMover() { _action = NULL; _sceneObject = NULL; } virtual ~ObjectMover(); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "ObjectMover"; } virtual void remove(); virtual void dispatch(); @@ -194,7 +194,7 @@ public: ObjectMover2(); virtual ~ObjectMover2() {} - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "ObjectMover2"; } virtual void dispatch(); virtual void startMove(SceneObject *sceneObj, va_list va); @@ -244,7 +244,7 @@ public: Common::Point _routeList[MAX_ROUTE_SIZE]; int _routeIndex; - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "PlayerMover"; } virtual void startMove(SceneObject *sceneObj, va_list va); virtual void endMove(); @@ -257,7 +257,7 @@ public: int _minArea; PlayerMover2() : PlayerMover() { _destObject = NULL; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "PlayerMover2"; } virtual void dispatch(); virtual void startMove(SceneObject *sceneObj, va_list va); @@ -275,7 +275,7 @@ public: public: PaletteModifier(); - virtual void synchronise(Serialiser &s) { + virtual void synchronize(Serializer &s) { SYNC_POINTER(_scenePalette); SYNC_POINTER(_action); } @@ -293,7 +293,7 @@ public: void setPalette(ScenePalette *palette, int step); virtual Common::String getClassName() { return "PaletteModifierCached"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); }; class PaletteRotation: public PaletteModifierCached { @@ -309,7 +309,7 @@ public: PaletteRotation(); virtual Common::String getClassName() { return "PaletteRotation"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void signal(); virtual void remove(); @@ -324,7 +324,7 @@ public: byte _palette[256 * 3]; public: virtual Common::String getClassName() { return "PaletteFader"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void signal(); virtual void remove(); }; @@ -363,7 +363,7 @@ public: static void changeBackground(const Rect &bounds, FadeMode fadeMode); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "ScenePalette"; } }; @@ -392,7 +392,7 @@ public: public: SceneItem() : EventHandler() { _msg = "Feature"; _action = NULL; _sceneRegionId = 0; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "SceneItem"; } virtual void remove(); virtual void destroy() {} @@ -413,8 +413,8 @@ public: int _state; virtual Common::String getClassName() { return "SceneItemExt"; } - virtual void synchronise(Serialiser &s) { - SceneItem::synchronise(s); + virtual void synchronize(Serializer &s) { + SceneItem::synchronize(s); s.syncAsSint16LE(_state); } }; @@ -435,7 +435,7 @@ public: void setup(int ys, int xs, int ye, int xe, const int resnum, const int lookLineNum, const int useLineNum); virtual void doAction(int action); virtual Common::String getClassName() { return "NamedHotspot"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); }; enum AnimateMode {ANIM_MODE_NONE = 0, ANIM_MODE_1 = 1, ANIM_MODE_2 = 2, ANIM_MODE_3 = 3, @@ -471,7 +471,7 @@ public: void setSceneObject(SceneObject *so); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "SceneObjectWrapper"; } virtual void remove(); virtual void dispatch(); @@ -545,7 +545,7 @@ public: int getSpliceArea(const SceneObject *obj); int getFrameCount(); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "SceneObject"; } virtual void postInit(SceneObjectList *OwnerList = NULL); virtual void remove(); @@ -565,8 +565,8 @@ class SceneObjectExt : public SceneObject { public: int _state; - virtual void synchronise(Serialiser &s) { - SceneObject::synchronise(s); + virtual void synchronize(Serializer &s) { + SceneObject::synchronize(s); s.syncAsSint16LE(_state); } virtual Common::String getClassName() { return "SceneObjectExt"; } @@ -587,7 +587,7 @@ public: void setup(const Common::String &msg); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "SceneText"; } virtual GfxSurface getFrame() { return _textSurface; } }; @@ -601,7 +601,7 @@ public: Player() : SceneObject() {} virtual Common::String getClassName() { return "Player"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void postInit(SceneObjectList *OwnerList = NULL); virtual void process(Event &event); @@ -679,7 +679,7 @@ public: void sortList(Common::Array<SceneObject *> &ObjList); virtual Common::String getClassName() { return "SceneObjectList"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); void draw(); void activate(); @@ -886,7 +886,7 @@ public: virtual ~GameHandler(); void execute(); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual Common::String getClassName() { return "GameHandler"; } virtual void postInit(SceneObjectList *OwnerList = NULL) {} virtual void dispatch() {} @@ -908,7 +908,7 @@ public: virtual void dispatch(); static void dispatchObject(EventHandler *obj); - static void saveListener(Serialiser &ser); + static void saveListener(Serializer &ser); }; /*--------------------------------------------------------------------------*/ diff --git a/engines/tsage/events.h b/engines/tsage/events.h index 90516b2353..86019ebf59 100644 --- a/engines/tsage/events.h +++ b/engines/tsage/events.h @@ -100,7 +100,7 @@ public: uint32 getFrameNumber() const { return _frameNumber; } void delay(int numFrames); - virtual void listenerSynchronise(Serialiser &s) { + virtual void listenerSynchronise(Serializer &s) { s.syncAsUint32LE(_frameNumber); s.syncAsUint32LE(_prevDelayFrame); // TODO: Synchronise unknown stuff diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index 26d2d13e4f..d5d63da76b 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -100,14 +100,14 @@ void Globals::reset() { _saver->addFactory(classFactoryProc); } -void Globals::synchronise(Serialiser &s) { +void Globals::synchronize(Serializer &s) { if (s.getVersion() >= 2) - SavedObject::synchronise(s); + SavedObject::synchronize(s); assert(_gfxManagers.size() == 1); - _sceneItems.synchronise(s); + _sceneItems.synchronize(s); SYNC_POINTER(_sceneObjects); - _sceneObjects_queue.synchronise(s); + _sceneObjects_queue.synchronize(s); s.syncAsSint32LE(_gfxFontNumber); s.syncAsSint32LE(_gfxColors.background); s.syncAsSint32LE(_gfxColors.foreground); @@ -115,7 +115,7 @@ void Globals::synchronise(Serialiser &s) { s.syncAsSint32LE(_fontColors.foreground); s.syncAsSint16LE(_dialogCenter.x); s.syncAsSint16LE(_dialogCenter.y); - _sceneListeners.synchronise(s); + _sceneListeners.synchronize(s); for (int i = 0; i < 256; ++i) s.syncAsByte(_flags[i]); diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 9e9ddd58d7..661ff4f768 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -90,7 +90,7 @@ public: GfxManager &gfxManager() { return **_gfxManagers.begin(); } virtual Common::String getClassName() { return "Globals"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); }; extern Globals *_globals; diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp index af38f211b2..fbc1e2a359 100644 --- a/engines/tsage/graphics.cpp +++ b/engines/tsage/graphics.cpp @@ -212,7 +212,7 @@ void Rect::expandPanes() { /** * Serialises the given rect */ -void Rect::synchronise(Serialiser &s) { +void Rect::synchronize(Serializer &s) { s.syncAsSint16LE(left); s.syncAsSint16LE(top); s.syncAsSint16LE(right); diff --git a/engines/tsage/graphics.h b/engines/tsage/graphics.h index c266d74bc5..8be4629493 100644 --- a/engines/tsage/graphics.h +++ b/engines/tsage/graphics.h @@ -55,7 +55,7 @@ public: void resize(const GfxSurface &surface, int xp, int yp, int percent); void expandPanes(); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); }; class GfxColors { diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp index 84276b026e..8c5049ca1a 100644 --- a/engines/tsage/ringworld_logic.cpp +++ b/engines/tsage/ringworld_logic.cpp @@ -319,9 +319,9 @@ void SceneArea::wait() { _globals->_events.setCursor(CURSOR_ARROW); } -void SceneArea::synchronise(Serialiser &s) { +void SceneArea::synchronize(Serializer &s) { if (s.getVersion() >= 2) - SavedObject::synchronise(s); + SavedObject::synchronize(s); s.syncAsSint16LE(_pt.x); s.syncAsSint16LE(_pt.y); @@ -329,7 +329,7 @@ void SceneArea::synchronise(Serialiser &s) { s.syncAsSint32LE(_rlbNum); s.syncAsSint32LE(_subNum); s.syncAsSint32LE(_actionId); - _bounds.synchronise(s); + _bounds.synchronize(s); } /*--------------------------------------------------------------------------*/ diff --git a/engines/tsage/ringworld_logic.h b/engines/tsage/ringworld_logic.h index eb395d59b8..d790631f2f 100644 --- a/engines/tsage/ringworld_logic.h +++ b/engines/tsage/ringworld_logic.h @@ -97,7 +97,7 @@ public: void display(); void restore(); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void draw(bool flag); virtual void wait(); }; diff --git a/engines/tsage/ringworld_scenes10.h b/engines/tsage/ringworld_scenes10.h index 2f5ce0f825..93987aa64b 100644 --- a/engines/tsage/ringworld_scenes10.h +++ b/engines/tsage/ringworld_scenes10.h @@ -39,8 +39,8 @@ class SceneObject9150 : public SceneObject { public: int _timer, _signalFlag; - virtual void synchronise(Serialiser &s) { - SceneObject::synchronise(s); + virtual void synchronize(Serializer &s) { + SceneObject::synchronize(s); s.syncAsSint16LE(_timer); s.syncAsSint16LE(_signalFlag); } @@ -52,8 +52,8 @@ public : int _sceneState; Scene2(); - virtual void synchronise(Serialiser &s) { - Scene::synchronise(s); + virtual void synchronize(Serializer &s) { + Scene::synchronize(s); s.syncAsSint16LE(_sceneState); } }; diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp index 13dfc1a40b..e3d25042a3 100644 --- a/engines/tsage/ringworld_scenes3.cpp +++ b/engines/tsage/ringworld_scenes3.cpp @@ -2195,8 +2195,8 @@ void Scene2120::postInit(SceneObjectList *OwnerList) { _globals->_sceneOffset.x = (_globals->_sceneManager._scene->_sceneBounds.left / 160) * 160; } -void Scene2120::synchronise(Serialiser &s) { - Scene::synchronise(s); +void Scene2120::synchronize(Serializer &s) { + Scene::synchronize(s); s.syncAsSint16LE(_dbMode); s.syncAsSint16LE(_prevDbMode); @@ -2589,10 +2589,10 @@ void Scene2150::postInit(SceneObjectList *OwnerList) { _globals->_sceneOffset.x = (_globals->_sceneManager._scene->_sceneBounds.left / 160) * 160; } -void Scene2150::synchronise(Serialiser &s) { - Scene::synchronise(s); - _rect1.synchronise(s); - _rect2.synchronise(s); +void Scene2150::synchronize(Serializer &s) { + Scene::synchronize(s); + _rect1.synchronize(s); + _rect2.synchronize(s); } void Scene2150::signal() { @@ -3006,9 +3006,9 @@ void Scene2200::stripCallback(int v) { } } -void Scene2200::synchronise(Serialiser &s) { - Scene::synchronise(s); - _exitRect.synchronise(s); +void Scene2200::synchronize(Serializer &s) { + Scene::synchronize(s); + _exitRect.synchronize(s); } void Scene2200::signal() { @@ -3733,9 +3733,9 @@ void Scene2230::postInit(SceneObjectList *OwnerList) { _globals->_sceneOffset.x = (_globals->_sceneManager._scene->_sceneBounds.left / 160) * 160; } -void Scene2230::synchronise(Serialiser &s) { - Scene::synchronise(s); - _rect1.synchronise(s); +void Scene2230::synchronize(Serializer &s) { + Scene::synchronize(s); + _rect1.synchronize(s); s.syncAsSint16LE(_field30A); } @@ -4355,9 +4355,9 @@ void Scene2280::dispatch() { } } -void Scene2280::synchronise(Serialiser &s) { - Scene::synchronise(s); - _exitRect.synchronise(s); +void Scene2280::synchronize(Serializer &s) { + Scene::synchronize(s); + _exitRect.synchronize(s); } /*-------------------------------------------------------------------------- @@ -4917,8 +4917,8 @@ void Scene2310::signal() { } } -void Scene2310::synchronise(Serialiser &s) { - Scene::synchronise(s); +void Scene2310::synchronize(Serializer &s) { + Scene::synchronize(s); s.syncAsSint16LE(_wireIndex); s.syncAsSint16LE(_pageIndex); @@ -5998,8 +5998,8 @@ void Scene2320::postInit(SceneObjectList *OwnerList) { &_hotspot13, &_hotspot4, &_hotspot3, &_hotspot2, &_hotspot1, NULL); } -void Scene2320::synchronise(Serialiser &s) { - Scene::synchronise(s); +void Scene2320::synchronize(Serializer &s) { + Scene::synchronize(s); SYNC_POINTER(_hotspotPtr); } diff --git a/engines/tsage/ringworld_scenes3.h b/engines/tsage/ringworld_scenes3.h index 2cbe8de65b..a25bf8834b 100644 --- a/engines/tsage/ringworld_scenes3.h +++ b/engines/tsage/ringworld_scenes3.h @@ -324,7 +324,7 @@ public: int _lineOffset; virtual void postInit(SceneObjectList *OwnerList = NULL); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); }; class Scene2150 : public Scene { @@ -381,7 +381,7 @@ public: Scene2150(); virtual void postInit(SceneObjectList *OwnerList = NULL); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void signal(); virtual void dispatch(); }; @@ -446,7 +446,7 @@ public: Scene2200(); virtual void postInit(SceneObjectList *OwnerList = NULL); virtual void stripCallback(int v); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void signal(); virtual void dispatch(); }; @@ -579,7 +579,7 @@ public: Scene2230(); virtual void postInit(SceneObjectList *OwnerList = NULL); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void dispatch(); }; @@ -679,7 +679,7 @@ public: Scene2280(); virtual void postInit(SceneObjectList *OwnerList = NULL); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void signal(); virtual void dispatch(); }; @@ -760,7 +760,7 @@ public: Scene2310(); virtual void postInit(SceneObjectList *OwnerList = NULL); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void signal(); virtual void process(Event &event); virtual void dispatch(); @@ -873,7 +873,7 @@ public: Scene2320(); virtual void postInit(SceneObjectList *OwnerList = NULL); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void signal(); }; diff --git a/engines/tsage/ringworld_scenes4.cpp b/engines/tsage/ringworld_scenes4.cpp index 89feb223a1..c42b7819f2 100644 --- a/engines/tsage/ringworld_scenes4.cpp +++ b/engines/tsage/ringworld_scenes4.cpp @@ -113,8 +113,8 @@ Scene3700::Viewer::Viewer() { _percentList[3] = 114; } -void Scene3700::Viewer::synchronise(Serialiser &s) { - SceneObject::synchronise(s); +void Scene3700::Viewer::synchronize(Serializer &s) { + SceneObject::synchronize(s); s.syncAsByte(_active); s.syncAsSint16LE(_countdownCtr); for (int idx = 0; idx < 4; ++idx) { diff --git a/engines/tsage/ringworld_scenes4.h b/engines/tsage/ringworld_scenes4.h index f5dac297fc..53ea7be491 100644 --- a/engines/tsage/ringworld_scenes4.h +++ b/engines/tsage/ringworld_scenes4.h @@ -67,7 +67,7 @@ class Scene3700 : public Scene { Viewer(); virtual Common::String getClassName() { return "Viewer"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void dispatch(); virtual void reposition(); virtual void draw(); diff --git a/engines/tsage/ringworld_scenes5.cpp b/engines/tsage/ringworld_scenes5.cpp index 0698e5cb2d..10c042c002 100644 --- a/engines/tsage/ringworld_scenes5.cpp +++ b/engines/tsage/ringworld_scenes5.cpp @@ -1415,8 +1415,8 @@ void Scene4025::Action3::signal() { /*--------------------------------------------------------------------------*/ -void Scene4025::Hole::synchronise(Serialiser &s) { - SceneObject::synchronise(s); +void Scene4025::Hole::synchronize(Serializer &s) { + SceneObject::synchronize(s); SYNC_POINTER(_pegPtr); s.syncAsSint16LE(_armStrip); s.syncAsSint16LE(_newPosition.x); @@ -1459,8 +1459,8 @@ void Scene4025::Hole::doAction(int action) { } } -void Scene4025::Peg::synchronise(Serialiser &s) { - SceneObject::synchronise(s); +void Scene4025::Peg::synchronize(Serializer &s) { + SceneObject::synchronize(s); s.syncAsSint16LE(_field88); SYNC_POINTER(_armStrip); } @@ -1600,8 +1600,8 @@ void Scene4025::postInit(SceneObjectList *OwnerList) { setAction(&_sequenceManager, this, 4026, NULL); } -void Scene4025::synchronise(Serialiser &s) { - Scene::synchronise(s); +void Scene4025::synchronize(Serializer &s) { + Scene::synchronize(s); SYNC_POINTER(_pegPtr); SYNC_POINTER(_pegPtr2); SYNC_POINTER(_holePtr); @@ -4195,8 +4195,8 @@ void Scene4300::process(Event &event) { * *--------------------------------------------------------------------------*/ -void Scene4301::Action1::synchronise(Serialiser &s) { - Action::synchronise(s); +void Scene4301::Action1::synchronize(Serializer &s) { + Action::synchronize(s); s.syncAsSint16LE(_field34E); for (int idx = 0; idx < 6; ++idx) s.syncAsSint16LE(_indexList[idx]); diff --git a/engines/tsage/ringworld_scenes5.h b/engines/tsage/ringworld_scenes5.h index 626eab5dab..6c44395f9c 100644 --- a/engines/tsage/ringworld_scenes5.h +++ b/engines/tsage/ringworld_scenes5.h @@ -97,8 +97,8 @@ class Scene4000 : public Scene { private: int _ctr; public: - virtual void synchronise(Serialiser &s) { - SceneObject::synchronise(s); + virtual void synchronize(Serializer &s) { + SceneObject::synchronize(s); s.syncAsUint16LE(_ctr); } virtual void doAction(int action); @@ -208,7 +208,7 @@ class Scene4025 : public Scene { int _armStrip; Common::Point _newPosition; - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void doAction(int action); }; class Peg : public SceneObject { @@ -217,7 +217,7 @@ class Scene4025 : public Scene { int _armStrip; Peg() : SceneObject() { _field88 = 0; _armStrip = 3; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void doAction(int action); }; @@ -248,7 +248,7 @@ public: Scene4025(); virtual void postInit(SceneObjectList *OwnerList = NULL); - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void remove(); virtual void signal(); virtual void process(Event &event); @@ -656,7 +656,7 @@ class Scene4301 : public Scene { int _field34E; int _indexList[6]; - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void remove(); virtual void signal(); virtual void process(Event &event); @@ -684,8 +684,8 @@ public: virtual void postInit(SceneObjectList *OwnerList = NULL); virtual void dispatch(); - virtual void synchronise(Serialiser &s) { - Scene::synchronise(s); + virtual void synchronize(Serializer &s) { + Scene::synchronize(s); s.syncAsSint16LE(_field68E); } }; diff --git a/engines/tsage/ringworld_scenes6.h b/engines/tsage/ringworld_scenes6.h index 16b2800fc6..0d81bb3b78 100644 --- a/engines/tsage/ringworld_scenes6.h +++ b/engines/tsage/ringworld_scenes6.h @@ -321,8 +321,8 @@ public: Scene5300(); virtual void postInit(SceneObjectList *OwnerList = NULL); virtual void signal(); - virtual void synchronise(Serialiser &s) { - Scene::synchronise(s); + virtual void synchronize(Serializer &s) { + Scene::synchronize(s); s.syncAsSint16LE(_field1B0A); } }; diff --git a/engines/tsage/ringworld_scenes8.cpp b/engines/tsage/ringworld_scenes8.cpp index 39288e89b2..487aaeea53 100644 --- a/engines/tsage/ringworld_scenes8.cpp +++ b/engines/tsage/ringworld_scenes8.cpp @@ -31,8 +31,8 @@ namespace tSage { -void NamedHotspotMult::synchronise(Serialiser &s) { - SceneHotspot::synchronise(s); +void NamedHotspotMult::synchronize(Serializer &s) { + SceneHotspot::synchronize(s); s.syncAsSint16LE(_useLineNum); s.syncAsSint16LE(_lookLineNum); } diff --git a/engines/tsage/ringworld_scenes8.h b/engines/tsage/ringworld_scenes8.h index e40f3d4133..a88a01b5a2 100644 --- a/engines/tsage/ringworld_scenes8.h +++ b/engines/tsage/ringworld_scenes8.h @@ -41,15 +41,15 @@ public: NamedHotspotMult() : SceneHotspot() {} virtual Common::String getClassName() { return "NamedHotspotMult"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); }; class SceneObject7700 : public SceneObjectExt { public: int _lookLineNum, _defltLineNum; - virtual void synchronise(Serialiser &s) { - SceneObject::synchronise(s); + virtual void synchronize(Serializer &s) { + SceneObject::synchronize(s); s.syncAsSint16LE(_lookLineNum); s.syncAsSint16LE(_defltLineNum); } diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp index 1ad7fa5ed0..daf1f86f82 100644 --- a/engines/tsage/saveload.cpp +++ b/engines/tsage/saveload.cpp @@ -65,7 +65,7 @@ Saver::~Saver() { /*--------------------------------------------------------------------------*/ -void Serialiser::syncPointer(SavedObject **ptr, Common::Serializer::Version minVersion, +void Serializer::syncPointer(SavedObject **ptr, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { int idx; assert(ptr); @@ -89,7 +89,7 @@ void Serialiser::syncPointer(SavedObject **ptr, Common::Serializer::Version minV } } -void Serialiser::validate(const Common::String &s, Common::Serializer::Version minVersion, +void Serializer::validate(const Common::String &s, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { Common::String tempStr = s; syncString(tempStr, minVersion, maxVersion); @@ -98,7 +98,7 @@ void Serialiser::validate(const Common::String &s, Common::Serializer::Version m error("Savegame is corrupt"); } -void Serialiser::validate(int v, Common::Serializer::Version minVersion, +void Serializer::validate(int v, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion) { int tempVal = v; syncAsUint32LE(tempVal, minVersion, maxVersion); @@ -118,10 +118,10 @@ Common::Error Saver::save(int slot, const Common::String &saveName) { _macroSaveFlag = true; _saveSlot = slot; - // Set up the serialiser + // Set up the serializer Common::OutSaveFile *saveFile = g_system->getSavefileManager()->openForSaving(_vm->generateSaveName(slot)); - Serialiser serialiser(NULL, saveFile); - serialiser.setSaveVersion(TSAGE_SAVEGAME_VERSION); + Serializer serializer(NULL, saveFile); + serializer.setSaveVersion(TSAGE_SAVEGAME_VERSION); // Write out the savegame header tSageSavegameHeader header; @@ -131,13 +131,13 @@ Common::Error Saver::save(int slot, const Common::String &saveName) { // Save out objects that need to come at the start of the savegame for (SynchronisedList<SaveListener *>::iterator i = _listeners.begin(); i != _listeners.end(); ++i) { - (*i)->listenerSynchronise(serialiser); + (*i)->listenerSynchronise(serializer); } // Save each registered SaveObject descendant object into the savegame file for (SynchronisedList<SavedObject *>::iterator i = _objList.begin(); i != _objList.end(); ++i) { - serialiser.validate((*i)->getClassName()); - (*i)->synchronise(serialiser); + serializer.validate((*i)->getClassName()); + (*i)->synchronize(serializer); } // Save file complete @@ -163,26 +163,26 @@ Common::Error Saver::restore(int slot) { _saveSlot = slot; _unresolvedPtrs.clear(); - // Set up the serialiser + // Set up the serializer Common::InSaveFile *saveFile = g_system->getSavefileManager()->openForLoading(_vm->generateSaveName(slot)); - Serialiser serialiser(saveFile, NULL); + Serializer serializer(saveFile, NULL); // Read in the savegame header tSageSavegameHeader header; readSavegameHeader(saveFile, header); delete header.thumbnail; - serialiser.setSaveVersion(header.version); + serializer.setSaveVersion(header.version); // Load in data for objects that need to come at the start of the savegame for (Common::List<SaveListener *>::iterator i = _listeners.begin(); i != _listeners.end(); ++i) { - (*i)->listenerSynchronise(serialiser); + (*i)->listenerSynchronise(serializer); } // Loop through each registered object to load in the data for (SynchronisedList<SavedObject *>::iterator i = _objList.begin(); i != _objList.end(); ++i) { - serialiser.validate((*i)->getClassName()); - (*i)->synchronise(serialiser); + serializer.validate((*i)->getClassName()); + (*i)->synchronize(serializer); } // Loop through the remaining data of the file, instantiating new objects. @@ -190,17 +190,17 @@ Common::Error Saver::restore(int slot) { // of instantiating a saved object registers it with the saver, and will then be resolved to whatever // object originally had a pointer to it as part of the post-processing step Common::String className; - serialiser.syncString(className); + serializer.syncString(className); while (className != "END") { SavedObject *savedObject; if (!_factoryPtr || ((savedObject = _factoryPtr(className)) == NULL)) error("Unknown class name '%s' encountered trying to restore savegame", className.c_str()); // Populate the contents of the object - savedObject->synchronise(serialiser); + savedObject->synchronize(serializer); // Move to next object - serialiser.syncString(className); + serializer.syncString(className); } // Post-process any unresolved pointers to get the correct pointer 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<typename T> class SynchronisedList : public Common::List<T> { public: - void synchronise(Serialiser &s) { + void synchronize(Serializer &s) { int entryCount; if (s.isLoading()) { diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp index fdd692d188..ac903df7ff 100644 --- a/engines/tsage/scenes.cpp +++ b/engines/tsage/scenes.cpp @@ -227,10 +227,10 @@ void SceneManager::setBgOffset(const Common::Point &pt, int loadCount) { _sceneLoadCount = loadCount; } -void SceneManager::listenerSynchronise(Serialiser &s) { +void SceneManager::listenerSynchronise(Serializer &s) { s.validate("SceneManager"); - _altSceneObjects.synchronise(s); + _altSceneObjects.synchronize(s); s.syncAsSint32LE(_sceneNumber); s.syncAsUint16LE(_globals->_sceneManager._scene->_activeScreenNumber); @@ -239,7 +239,7 @@ void SceneManager::listenerSynchronise(Serialiser &s) { checkScene(); } - _globals->_sceneManager._scrollerRect.synchronise(s); + _globals->_sceneManager._scrollerRect.synchronize(s); SYNC_POINTER(_globals->_scrollFollower); s.syncAsSint16LE(_loadMode); } @@ -256,17 +256,17 @@ Scene::Scene() : _sceneBounds(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), Scene::~Scene() { } -void Scene::synchronise(Serialiser &s) { +void Scene::synchronize(Serializer &s) { if (s.getVersion() >= 2) - StripCallback::synchronise(s); + StripCallback::synchronize(s); s.syncAsSint32LE(_field12); s.syncAsSint32LE(_screenNumber); s.syncAsSint32LE(_activeScreenNumber); s.syncAsSint32LE(_sceneMode); - _backgroundBounds.synchronise(s); - _sceneBounds.synchronise(s); - _oldSceneBounds.synchronise(s); + _backgroundBounds.synchronize(s); + _sceneBounds.synchronize(s); + _oldSceneBounds.synchronize(s); s.syncAsSint16LE(_fieldA); s.syncAsSint16LE(_fieldE); diff --git a/engines/tsage/scenes.h b/engines/tsage/scenes.h index 0ac906728f..9e82053516 100644 --- a/engines/tsage/scenes.h +++ b/engines/tsage/scenes.h @@ -59,7 +59,7 @@ public: virtual ~Scene(); virtual Common::String getClassName() { return "Scene"; } - virtual void synchronise(Serialiser &s); + virtual void synchronize(Serializer &s); virtual void stripCallback(int v) {} virtual void postInit(SceneObjectList *OwnerList = NULL); virtual void process(Event &event); @@ -93,7 +93,7 @@ public: SceneManager(); virtual ~SceneManager(); - virtual void listenerSynchronise(Serialiser &s); + virtual void listenerSynchronise(Serializer &s); void setNewScene(int sceneNumber); void checkScene(); void sceneChange(); diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp index 63e753104e..10ac8070e2 100644 --- a/engines/tsage/sound.cpp +++ b/engines/tsage/sound.cpp @@ -52,7 +52,7 @@ void SoundManager::loadNotifierProc(bool postFlag) { warning("TODO: SoundManager::loadNotifierProc"); } -void SoundManager::listenerSynchronise(Serialiser &s) { +void SoundManager::listenerSynchronise(Serializer &s) { s.validate("SoundManager"); warning("TODO: SoundManager listenerSynchronise"); } diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h index a495344038..f77ad9ee50 100644 --- a/engines/tsage/sound.h +++ b/engines/tsage/sound.h @@ -34,7 +34,7 @@ namespace tSage { class SoundManager : public SaveListener { public: void dispatch() {} - virtual void listenerSynchronise(Serialiser &s); + virtual void listenerSynchronise(Serializer &s); virtual void postInit(); void proc2() {} |