TSAGE: Some more conversions to US English

14 files changed, 45 insertions, 45 deletions

diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 319807bdb0..bb218f198c 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -604,7 +604,7 @@ void StripManager::synchronize(Serializer &s) {
 	s.syncAsByte(_field2E6);
 	s.syncAsSint32LE(_field2E8);
 
-	// Synchronise the item list
+	// Synchronize the item list
 	int arrSize = _obj44List.size();
 	s.syncAsUint16LE(arrSize);
 	if (s.isLoading())
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index bd33b1b9d3..da80111aa9 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1250,7 +1250,7 @@ void ScenePalette::getPalette(int start, int count) {
 }
 
 void ScenePalette::signalListeners() {
-	SynchronisedList<PaletteModifier *>::iterator i = _listeners.begin();
+	SynchronizedList<PaletteModifier *>::iterator i = _listeners.begin();
 	while (i != _listeners.end()) {
 		PaletteModifier *obj = *i;
 		++i;
@@ -1259,7 +1259,7 @@ void ScenePalette::signalListeners() {
 }
 
 void ScenePalette::clearListeners() {
-	SynchronisedList<PaletteModifier *>::iterator i = _listeners.begin();
+	SynchronizedList<PaletteModifier *>::iterator i = _listeners.begin();
 	while (i != _listeners.end()) {
 		PaletteModifier *obj = *i;
 		++i;
@@ -1343,7 +1343,7 @@ void ScenePalette::changeBackground(const Rect &bounds, FadeMode fadeMode) {
 	_globals->_screenSurface.copyFrom(_globals->_sceneManager._scene->_backSurface,
 		bounds, Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), NULL);
 
-	for (SynchronisedList<PaletteModifier *>::iterator i = tempPalette._listeners.begin(); i != tempPalette._listeners.end(); ++i)
+	for (SynchronizedList<PaletteModifier *>::iterator i = tempPalette._listeners.begin(); i != tempPalette._listeners.end(); ++i)
 		delete *i;
 	tempPalette._listeners.clear();
 }
@@ -1895,7 +1895,7 @@ int SceneObject::checkRegion(const Common::Point &pt) {
 	}
 	newY -= _yDiff;
 
-	SynchronisedList<SceneObject *>::iterator i;
+	SynchronizedList<SceneObject *>::iterator i;
 	for (i = _globals->_sceneObjects->begin(); (regionIndex == 0) && (i != _globals->_sceneObjects->end()); ++i) {
 		if ((*i) && ((*i)->_flags & OBJFLAG_CHECK_REGION)) {
 			int objYDiff = (*i)->_position.y - _yDiff;
@@ -2320,7 +2320,7 @@ void SceneObjectList::draw() {
 		uint32 flagMask = (paneNum == 0) ? OBJFLAG_PANE_0 : OBJFLAG_PANE_1;
 
 		// Initial loop to set up object list and update object position, priority, and flags
-		for (SynchronisedList<SceneObject *>::iterator i = _globals->_sceneObjects->begin();
+		for (SynchronizedList<SceneObject *>::iterator i = _globals->_sceneObjects->begin();
 				i != _globals->_sceneObjects->end(); ++i) {
 			SceneObject *obj = *i;
 			objList.push_back(obj);
@@ -2474,7 +2474,7 @@ void SceneObjectList::activate() {
 	_globals->_sceneObjects_queue.push_front(this);
 
 	// Flag all the objects as modified
-	SynchronisedList<SceneObject *>::iterator i;
+	SynchronizedList<SceneObject *>::iterator i;
 	for (i = begin(); i != end(); ++i) {
 		(*i)->_flags |= OBJFLAG_PANES;
 	}
@@ -2495,7 +2495,7 @@ void SceneObjectList::deactivate() {
 	_globals->_sceneObjects_queue.pop_front();
 	_globals->_sceneObjects = *_globals->_sceneObjects_queue.begin();
 
-	SynchronisedList<SceneObject *>::iterator i;
+	SynchronizedList<SceneObject *>::iterator i;
 	for (i = objectList->begin(); i != objectList->end(); ++i) {
 		if (!((*i)->_flags & OBJFLAG_CLONED)) {
 			SceneObject *sceneObj = (*i)->clone();
@@ -3549,7 +3549,7 @@ void SceneHandler::process(Event &event) {
 		if (_globals->_player._uiEnabled && (event.eventType == EVENT_BUTTON_DOWN) &&
 				!_globals->_sceneItems.empty()) {
 			// Scan the item list to find one the mouse is within
-			SynchronisedList<SceneItem *>::iterator i = _globals->_sceneItems.begin();
+			SynchronizedList<SceneItem *>::iterator i = _globals->_sceneItems.begin();
 			while ((i != _globals->_sceneItems.end()) && !(*i)->contains(event.mousePos))
 				++i;
 
@@ -3639,7 +3639,7 @@ void Game::execute() {
 	do {
 		// Process all currently atcive game handlers
 		activeFlag = false;
-		for (SynchronisedList<GameHandler *>::iterator i = _handlers.begin(); i != _handlers.end(); ++i) {
+		for (SynchronizedList<GameHandler *>::iterator i = _handlers.begin(); i != _handlers.end(); ++i) {
 			GameHandler *gh = *i;
 			if (gh->_lockCtr.getCtr() == 0) {
 				gh->execute();
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index d58340dfe6..d1d3411e5a 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -73,7 +73,7 @@ public:
 
 class InvObjectList : public SavedObject {
 public:
-	SynchronisedList<InvObject *> _itemList;
+	SynchronizedList<InvObject *> _itemList;
 	InvObject *_selectedItem;
 
 	InvObjectList();
@@ -337,7 +337,7 @@ class ScenePalette : public SavedObject {
 public:
 	byte _palette[256 * 3];
 	GfxColors _colors;
-	SynchronisedList<PaletteModifier *> _listeners;
+	SynchronizedList<PaletteModifier *> _listeners;
 	int _field412;
 
 	uint8 _redColor;
@@ -672,7 +672,7 @@ class SceneObjectList : public SavedObject {
 private:
 	void checkIntersection(Common::Array<SceneObject *> &ObjList, uint ObjIndex, int PaneNum);
 
-	SynchronisedList<SceneObject *> _objList;
+	SynchronizedList<SceneObject *> _objList;
 	bool _listAltered;
 public:
 	SceneObjectList() { _listAltered = false; }
@@ -689,14 +689,14 @@ public:
 	void recurse(EventHandlerFn Fn) {
 		// Loop through each object
 		_listAltered = false;
-		for (SynchronisedList<SceneObject *>::iterator i = _objList.begin(); i != _objList.end() && !_listAltered; ) {
+		for (SynchronizedList<SceneObject *>::iterator i = _objList.begin(); i != _objList.end() && !_listAltered; ) {
 			SceneObject *o = *i;
 			++i;
 			Fn(o);
 		}
 	}
-	SynchronisedList<SceneObject *>::iterator begin() { return _objList.begin(); }
-	SynchronisedList<SceneObject *>::iterator end() { return _objList.end(); }
+	SynchronizedList<SceneObject *>::iterator begin() { return _objList.begin(); }
+	SynchronizedList<SceneObject *>::iterator end() { return _objList.end(); }
 	int size() const { return _objList.size(); }
 	bool contains(SceneObject *sceneObj) { return tSage::contains(_objList, sceneObj); }
 	void push_back(SceneObject *sceneObj) { _objList.push_back(sceneObj); }
@@ -789,7 +789,7 @@ public:
 
 /*--------------------------------------------------------------------------*/
 
-class SceneItemList : public SynchronisedList<SceneItem *> {
+class SceneItemList : public SynchronizedList<SceneItem *> {
 public:
 	void addItems(SceneItem *first, ...);
 };
@@ -915,7 +915,7 @@ public:
 
 class Game {
 protected:
-	SynchronisedList<GameHandler *> _handlers;
+	SynchronizedList<GameHandler *> _handlers;
 
 	static bool notLockedFn(GameHandler *g);
 	virtual void handleSaveLoad(bool saveFlag, int &saveSlot, Common::String &saveName) {}
diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp
index b5f00bf73c..f8e35f74f9 100644
--- a/engines/tsage/dialogs.cpp
+++ b/engines/tsage/dialogs.cpp
@@ -379,7 +379,7 @@ bool GfxInvImage::process(Event &event) {
 void InventoryDialog::show() {
 	// Determine how many items are in the player's inventory
 	int itemCount = 0;
-	SynchronisedList<InvObject *>::iterator i;
+	SynchronizedList<InvObject *>::iterator i;
 	for (i = RING_INVENTORY._itemList.begin(); i != RING_INVENTORY._itemList.end(); ++i) {
 		if ((*i)->inInventory())
 			++itemCount;
@@ -400,7 +400,7 @@ InventoryDialog::InventoryDialog() {
 	// Determine the maximum size of the image of any item in the player's inventory
 	int imgWidth = 0, imgHeight = 0;
 
-	SynchronisedList<InvObject *>::iterator i;
+	SynchronizedList<InvObject *>::iterator i;
 	for (i = RING_INVENTORY._itemList.begin(); i != RING_INVENTORY._itemList.end(); ++i) {
 		InvObject *invObject = *i;
 		if (invObject->inInventory()) {
diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index 86019ebf59..d2dbd9e058 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -100,10 +100,10 @@ public:
 	uint32 getFrameNumber() const { return _frameNumber; }
 	void delay(int numFrames);
 
-	virtual void listenerSynchronise(Serializer &s) {
+	virtual void listenerSynchronize(Serializer &s) {
 		s.syncAsUint32LE(_frameNumber);
 		s.syncAsUint32LE(_prevDelayFrame);
-		// TODO: Synchronise unknown stuff
+		// TODO: Synchronize unknown stuff
 	}
 };
 
diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h
index 661ff4f768..3a6fab5b70 100644
--- a/engines/tsage/globals.h
+++ b/engines/tsage/globals.h
@@ -49,7 +49,7 @@ public:
 	SceneItemList _sceneItems;
 	SceneObjectList _sceneObjectsInstance;
 	SceneObjectList *_sceneObjects;
-	SynchronisedList<SceneObjectList *> _sceneObjects_queue;
+	SynchronizedList<SceneObjectList *> _sceneObjects_queue;
 	SceneText _sceneText;
 	int _gfxFontNumber;
 	GfxColors _gfxColors;
@@ -57,7 +57,7 @@ public:
 	SoundManager _soundManager;
 	Common::Point _dialogCenter;
 	WalkRegions _walkRegions;
-	SynchronisedList<EventHandler *> _sceneListeners;
+	SynchronizedList<EventHandler *> _sceneListeners;
 	bool _flags[256];
 	Player _player;
 	SoundHandler _soundHandler;
diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp
index 8c5049ca1a..be83b0b61e 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld_logic.cpp
@@ -307,7 +307,7 @@ void SceneArea::wait() {
 		g_system->delayMillis(10);
 	}
 
-	SynchronisedList<SceneItem *>::iterator ii;
+	SynchronizedList<SceneItem *>::iterator ii;
 	for (ii = _globals->_sceneItems.begin(); ii != _globals->_sceneItems.end(); ++ii) {
 		SceneItem *sceneItem = *ii;
 		if (sceneItem->contains(event.mousePos)) {
diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index e3d25042a3..f788f9a28b 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -2727,7 +2727,7 @@ void Scene2200::Action3::signal() {
 			_actionIndex = 8;
 			setDelay(5);
 		} else {
-			for (SynchronisedList<SceneObject *>::iterator i = _globals->_sceneObjects->begin();
+			for (SynchronizedList<SceneObject *>::iterator i = _globals->_sceneObjects->begin();
 					i != _globals->_sceneObjects->end(); ++i) {
 				(*i)->hide();
 			}
@@ -2764,7 +2764,7 @@ void Scene2200::Action3::signal() {
 		setDelay(5);
 		break;
 	case 7:
-		for (SynchronisedList<SceneObject *>::iterator i = _globals->_sceneObjects->begin();
+		for (SynchronizedList<SceneObject *>::iterator i = _globals->_sceneObjects->begin();
 				i != _globals->_sceneObjects->end(); ++i)
 			(*i)->show();
 
diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp
index daf1f86f82..a0091bfd6a 100644
--- a/engines/tsage/saveload.cpp
+++ b/engines/tsage/saveload.cpp
@@ -53,7 +53,7 @@ Saver::Saver() {
 Saver::~Saver() {
 	// Internal validation that no saved object is still present
 	int totalLost = 0;
-	for (SynchronisedList<SavedObject *>::iterator i = _saver->_objList.begin(); i != _saver->_objList.end(); ++i) {
+	for (SynchronizedList<SavedObject *>::iterator i = _saver->_objList.begin(); i != _saver->_objList.end(); ++i) {
 		SavedObject *so = *i;
 		if (so)
 			++totalLost;
@@ -130,12 +130,12 @@ Common::Error Saver::save(int slot, const Common::String &saveName) {
 	writeSavegameHeader(saveFile, header);
 
 	// 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(serializer);
+	for (SynchronizedList<SaveListener *>::iterator i = _listeners.begin(); i != _listeners.end(); ++i) {
+		(*i)->listenerSynchronize(serializer);
 	}
 
 	// Save each registered SaveObject descendant object into the savegame file
-	for (SynchronisedList<SavedObject *>::iterator i = _objList.begin(); i != _objList.end(); ++i) {
+	for (SynchronizedList<SavedObject *>::iterator i = _objList.begin(); i != _objList.end(); ++i) {
 		serializer.validate((*i)->getClassName());
 		(*i)->synchronize(serializer);
 	}
@@ -176,11 +176,11 @@ Common::Error Saver::restore(int slot) {
 
 	// 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(serializer);
+		(*i)->listenerSynchronize(serializer);
 	}
 
 	// Loop through each registered object to load in the data
-	for (SynchronisedList<SavedObject *>::iterator i = _objList.begin(); i != _objList.end(); ++i) {
+	for (SynchronizedList<SavedObject *>::iterator i = _objList.begin(); i != _objList.end(); ++i) {
 		serializer.validate((*i)->getClassName());
 		(*i)->synchronize(serializer);
 	}
@@ -379,7 +379,7 @@ void Saver::resolveLoadPointers() {
 
 	// Outer loop through the main object list
 	int objIndex = 1;
-	for (SynchronisedList<SavedObject *>::iterator iObj = _objList.begin(); iObj != _objList.end(); ++iObj, ++objIndex) {
+	for (SynchronizedList<SavedObject *>::iterator iObj = _objList.begin(); iObj != _objList.end(); ++iObj, ++objIndex) {
 		Common::List<SavedObjectRef>::iterator iPtr;
 		SavedObject *pObj = *iObj;
 
diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h
index 8ec519a263..cf7d087e6e 100644
--- a/engines/tsage/saveload.h
+++ b/engines/tsage/saveload.h
@@ -93,7 +93,7 @@ public:
 class SaveListener {
 public:
 	virtual ~SaveListener() {}
-	virtual void listenerSynchronise(Serializer &s) = 0;
+	virtual void listenerSynchronize(Serializer &s) = 0;
 };
 
 /*--------------------------------------------------------------------------*/
@@ -115,7 +115,7 @@ public:
  * Derived list class with extra functionality
  */
 template<typename T>
-class SynchronisedList : public Common::List<T> {
+class SynchronizedList : public Common::List<T> {
 public:
 	void synchronize(Serializer &s) {
 		int entryCount;
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index ac903df7ff..f554d546f6 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -71,7 +71,7 @@ void SceneManager::sceneChange() {
 	}
 
 	// Clear the scene objects
-	SynchronisedList<SceneObject *>::iterator io = _globals->_sceneObjects->begin();
+	SynchronizedList<SceneObject *>::iterator io = _globals->_sceneObjects->begin();
 	while (io != _globals->_sceneObjects->end()) {
 		SceneObject *sceneObj = *io;
 		++io;
@@ -87,7 +87,7 @@ void SceneManager::sceneChange() {
 	}
 
 	// Clear the hotspot list
-	SynchronisedList<SceneItem *>::iterator ii = _globals->_sceneItems.begin();
+	SynchronizedList<SceneItem *>::iterator ii = _globals->_sceneItems.begin();
 	while (ii != _globals->_sceneItems.end()) {
 		SceneItem *sceneItem = *ii;
 		++ii;
@@ -164,7 +164,7 @@ void SceneManager::changeScene(int newSceneNumber) {
 	}
 
 	// Stop any objects that were animating
-	SynchronisedList<SceneObject *>::iterator i;
+	SynchronizedList<SceneObject *>::iterator i;
 	for (i = _globals->_sceneObjects->begin(); i != _globals->_sceneObjects->end(); ++i) {
 		SceneObject *sceneObj = *i;
 		Common::Point pt(0, 0);
@@ -227,7 +227,7 @@ void SceneManager::setBgOffset(const Common::Point &pt, int loadCount) {
 	_sceneLoadCount = loadCount;
 }
 
-void SceneManager::listenerSynchronise(Serializer &s) {
+void SceneManager::listenerSynchronize(Serializer &s) {
 	s.validate("SceneManager");
 
 	_altSceneObjects.synchronize(s);
@@ -436,7 +436,7 @@ void Scene::drawAltObjects() {
 	Common::Array<SceneObject *> objList;
 
 	// Initial loop to set the priority for entries in the list
-	for (SynchronisedList<SceneObject *>::iterator i = _globals->_sceneManager._altSceneObjects.begin();
+	for (SynchronizedList<SceneObject *>::iterator i = _globals->_sceneManager._altSceneObjects.begin();
 		i != _globals->_sceneManager._altSceneObjects.end(); ++i) {
 		SceneObject *obj = *i;
 		objList.push_back(obj);
diff --git a/engines/tsage/scenes.h b/engines/tsage/scenes.h
index 9e82053516..11637de1a7 100644
--- a/engines/tsage/scenes.h
+++ b/engines/tsage/scenes.h
@@ -93,7 +93,7 @@ public:
 	SceneManager();
 	virtual ~SceneManager();
 
-	virtual void listenerSynchronise(Serializer &s);
+	virtual void listenerSynchronize(Serializer &s);
 	void setNewScene(int sceneNumber);
 	void checkScene();
 	void sceneChange();
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 10ac8070e2..9d50316baf 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -52,9 +52,9 @@ void SoundManager::loadNotifierProc(bool postFlag) {
 	warning("TODO: SoundManager::loadNotifierProc");
 }
 
-void SoundManager::listenerSynchronise(Serializer &s) {
+void SoundManager::listenerSynchronize(Serializer &s) {
 	s.validate("SoundManager");
-	warning("TODO: SoundManager listenerSynchronise");
+	warning("TODO: SoundManager listenerSynchronize");
 }
 
 } // End of namespace tSage
diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h
index f77ad9ee50..45815de69f 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(Serializer &s);
+	virtual void listenerSynchronize(Serializer &s);
 	virtual void postInit();
 
 	void proc2() {}