aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/core.h
diff options
context:
space:
mode:
authormd52011-05-04 11:41:47 +0300
committermd52011-05-04 11:41:47 +0300
commit3430a3f347c2430540bf3de17715e8fbc5d1a795 (patch)
tree19d02dbcfc3210fcbb33fa88012b36b2bf3d2092 /engines/tsage/core.h
parent5c3b564e0b8fca3c1c4800aef9363f37805f4788 (diff)
downloadscummvm-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/tsage/core.h')
-rw-r--r--engines/tsage/core.h56
1 files changed, 28 insertions, 28 deletions
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);
};
/*--------------------------------------------------------------------------*/