Skip to content

Commit

Permalink
TSAGE: Switched to American English, after the relevant discussion on…
Browse files Browse the repository at this point in the history 
… -devel:

serialiser -> serializer
synchronise -> synchronize
  • Loading branch information
@bluegr
bluegr committed May 4, 2011
1 parent 5c3b564 commit 3430a3f
Show file tree
Hide file tree
Showing 27 changed files with 194 additions and 194 deletions.
24 changes: 12 additions & 12 deletions engines/tsage/converse.cpp
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
Expand All @@ -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();
Expand Down Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions engines/tsage/converse.h
View file
Expand Up @@ -58,7 +58,7 @@ class SequenceManager : public Action {
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);
Expand Down Expand Up @@ -86,7 +86,7 @@ class Speaker : public EventHandler {
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);
Expand Down Expand Up @@ -168,7 +168,7 @@ class Obj0A : public Serialisable {
int _id;
uint _scriptOffset;

virtual void synchronise(Serialiser &s) {
virtual void synchronize(Serializer &s) {
s.syncAsSint32LE(_id);
s.syncAsUint32LE(_scriptOffset);
}
Expand All @@ -184,7 +184,7 @@ class Obj44 : public Serialisable {
uint _speakerOffset;
public:
void load(const byte *dataP);
virtual void synchronise(Serialiser &s);
virtual void synchronize(Serializer &s);
};

class StripManager : public Action {
Expand Down Expand Up @@ -212,7 +212,7 @@ class StripManager : public Action {
StripManager();
virtual ~StripManager();

virtual void synchronise(Serialiser &s);
virtual void synchronize(Serializer &s);
virtual void remove();
virtual void signal();
virtual void process(Event &event);
Expand Down
86 changes: 43 additions & 43 deletions engines/tsage/core.cpp
View file
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
}

Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
}

/*--------------------------------------------------------------------------*/
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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");
}

Expand Down

0 comments on commit 3430a3f

Please sign in to comment.