TSAGE: Some British to American English

7 files changed, 36 insertions, 35 deletions

diff --git a/engines/tsage/debugger.cpp b/engines/tsage/debugger.cpp
index d87afc797e..140e1afea5 100644
--- a/engines/tsage/debugger.cpp
+++ b/engines/tsage/debugger.cpp
@@ -653,7 +653,7 @@ bool Ringworld2Debugger::Cmd_ListObjects(int argc, const char **argv) {
 	DebugPrintf("11 - R2_CHARGED_POWER_CAPSULE\n");
 	DebugPrintf("12 - R2_AEROSOL\n");
 	DebugPrintf("13 - R2_REMOTE_CONTROL\n");
-	DebugPrintf("14 - R2_OPTICAL_FIBRE\n");
+	DebugPrintf("14 - R2_OPTICAL_FIBER\n");
 	DebugPrintf("15 - R2_CLAMP\n");
 	DebugPrintf("16 - R2_ATTRACTOR_CABLE_HARNESS\n");
 	DebugPrintf("17 - R2_FUEL_CELL\n");
diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index 0a99290f88..a3d96abef4 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -90,7 +90,7 @@ enum CursorType {
 	R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, R2_SONIC_STUNNER = 7,
 	R2_CABLE_HARNESS = 8, R2_COM_SCANNER = 9, R2_SPENT_POWER_CAPSULE = 10,
 	R2_CHARGED_POWER_CAPSULE = 11, R2_AEROSOL = 12, R2_REMOTE_CONTROL = 13,
-	R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_ATTRACTOR_CABLE_HARNESS = 16,
+	R2_OPTICAL_FIBER = 14, R2_CLAMP = 15, R2_ATTRACTOR_CABLE_HARNESS = 16,
 	R2_FUEL_CELL = 17, R2_GYROSCOPE = 18, R2_AIRBAG = 19, R2_REBREATHER_TANK = 20,
 	R2_RESERVE_REBREATHER_TANK = 21, R2_GUIDANCE_MODULE = 22, R2_THRUSTER_VALVE = 23,
 	R2_BALLOON_BACKPACK = 24, R2_RADAR_MECHANISM = 25, R2_JOYSTICK = 26,
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 555e3951dd..773425fae3 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -814,7 +814,7 @@ Ringworld2InvObjectList::Ringworld2InvObjectList():
 		_chargedPowerCapsule(1, 12),
 		_aerosol(1, 13),
 		_remoteControl(1, 14),
-		_opticalFibre(1, 15),
+		_opticalFiber(1, 15),
 		_clamp(1, 16),
 		_attractorHarness(1, 17),
 		_fuelCell(2, 2),
@@ -869,7 +869,7 @@ Ringworld2InvObjectList::Ringworld2InvObjectList():
 	_itemList.push_back(&_chargedPowerCapsule);
 	_itemList.push_back(&_aerosol);
 	_itemList.push_back(&_remoteControl);
-	_itemList.push_back(&_opticalFibre);
+	_itemList.push_back(&_opticalFiber);
 	_itemList.push_back(&_clamp);
 	_itemList.push_back(&_attractorHarness);
 	_itemList.push_back(&_fuelCell);
@@ -933,7 +933,7 @@ void Ringworld2InvObjectList::reset() {
 	setObjectScene(R2_CHARGED_POWER_CAPSULE, 400);
 	setObjectScene(R2_AEROSOL, 500);
 	setObjectScene(R2_REMOTE_CONTROL, 1550);
-	setObjectScene(R2_OPTICAL_FIBRE, 850);
+	setObjectScene(R2_OPTICAL_FIBER, 850);
 	setObjectScene(R2_CLAMP, 850);
 	setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 0);
 	setObjectScene(R2_FUEL_CELL, 1550);
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index 94dd2946fd..31d801fa55 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -178,7 +178,7 @@ public:
 	InvObject _chargedPowerCapsule;
 	InvObject _aerosol;
 	InvObject _remoteControl;
-	InvObject _opticalFibre;
+	InvObject _opticalFiber;
 	InvObject _clamp;
 	InvObject _attractorHarness;
 	InvObject _fuelCell;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 5f532e3b9a..c6dd248729 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -6721,19 +6721,19 @@ bool Scene800::Button::startAction(CursorType action, Event &event) {
 }
 
 bool Scene800::CableJunction::startAction(CursorType action, Event &event) {
-	if (action != R2_OPTICAL_FIBRE) {
+	if (action != R2_OPTICAL_FIBER) {
 		return NamedHotspot::startAction(action, event);
 	} else {
 		Scene800 *scene = (Scene800 *)R2_GLOBALS._sceneManager._scene;
 
 		R2_GLOBALS._player.disableControl();
-		scene->_opticalFibre.postInit();
+		scene->_opticalFiber.postInit();
 		scene->_sceneMode = 803;
 
 		if (R2_INVENTORY.getObjectScene(R2_READER) == 800)
-			scene->setAction(&scene->_sequenceManager1, scene, 813, &R2_GLOBALS._player, &scene->_opticalFibre, &scene->_reader, NULL);
+			scene->setAction(&scene->_sequenceManager1, scene, 813, &R2_GLOBALS._player, &scene->_opticalFiber, &scene->_reader, NULL);
 		else
-			scene->setAction(&scene->_sequenceManager1, scene, 803, &R2_GLOBALS._player, &scene->_opticalFibre, NULL);
+			scene->setAction(&scene->_sequenceManager1, scene, 803, &R2_GLOBALS._player, &scene->_opticalFiber, NULL);
 
 		return true;
 	}
@@ -6751,8 +6751,8 @@ bool Scene800::DeviceSlot::startAction(CursorType action, Event &event) {
 		_lookLineNum = 27;
 		scene->_sceneMode = 809;
 
-		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800)
-			scene->setAction(&scene->_sequenceManager1, scene, 815, &R2_GLOBALS._player, &scene->_reader, &scene->_opticalFibre, NULL);
+		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) == 800)
+			scene->setAction(&scene->_sequenceManager1, scene, 815, &R2_GLOBALS._player, &scene->_reader, &scene->_opticalFiber, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager1, scene, 809, &R2_GLOBALS._player, &scene->_reader, NULL);
 		return true;
@@ -6761,9 +6761,9 @@ bool Scene800::DeviceSlot::startAction(CursorType action, Event &event) {
 		scene->_reader.postInit();
 		scene->_sceneMode = 804;
 
-		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
+		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) == 800) {
 			scene->setAction(&scene->_sequenceManager1, scene, 814, &R2_GLOBALS._player,
-				&scene->_reader, &scene->_opticalFibre, NULL);
+				&scene->_reader, &scene->_opticalFiber, NULL);
 		} else {
 			scene->setAction(&scene->_sequenceManager1, scene, 804, &R2_GLOBALS._player,
 				&scene->_reader, NULL);
@@ -6879,22 +6879,22 @@ void Scene800::postInit(SceneObjectList *OwnerList) {
 	_autodocCover.setPosition(Common::Point(119, 161));
 	_autodocCover.setDetails(800, 6, 7, -1, 1, (SceneItem *)NULL);
 
-	if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
-		_opticalFibre.postInit();
+	if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) == 800) {
+		_opticalFiber.postInit();
 		if (R2_INVENTORY.getObjectScene(R2_READER) == 800)
-			_opticalFibre.setup(800, 4, 1);
+			_opticalFiber.setup(800, 4, 1);
 		else
-			_opticalFibre.setup(800, 7, 2);
+			_opticalFiber.setup(800, 7, 2);
 
-		_opticalFibre.setPosition(Common::Point(220, 124));
-		_opticalFibre.fixPriority(140);
+		_opticalFiber.setPosition(Common::Point(220, 124));
+		_opticalFiber.fixPriority(140);
 	}
 
 	if (R2_INVENTORY.getObjectScene(R2_READER) == 800) {
 		_reader.postInit();
 
-		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 800) {
-			_opticalFibre.setup(800, 4, 1);
+		if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) == 800) {
+			_opticalFiber.setup(800, 4, 1);
 			_reader.hide();
 		} else {
 			_reader.setup(800, 7, 1);
@@ -6969,7 +6969,7 @@ void Scene800::signal() {
 		break;
 	case 803:
 		R2_GLOBALS._player.enableControl();
-		R2_INVENTORY.setObjectScene(R2_OPTICAL_FIBRE, 800);
+		R2_INVENTORY.setObjectScene(R2_OPTICAL_FIBER, 800);
 		break;
 	case 804:
 		R2_GLOBALS._player.enableControl();
@@ -7265,7 +7265,7 @@ void Scene825::doButtonPress(int buttonId) {
 
 			if (R2_GLOBALS.getFlag(4)) {
 				if ((R2_INVENTORY.getObjectScene(R2_READER) != 800) ||
-						(R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) != 800)) {
+						(R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) != 800)) {
 					_sceneText.setPosition(Common::Point(116, 75));
 					_sceneText.setup(ACCESS_CODE_REQUIRED);
 				} else if (R2_INVENTORY.getObjectScene(R2_OPTO_DISK) != 800) {
@@ -7282,7 +7282,7 @@ void Scene825::doButtonPress(int buttonId) {
 				R2_GLOBALS.setFlag(2);
 
 				if ((R2_INVENTORY.getObjectScene(R2_READER) != 800) ||
-						(R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) != 800)) {
+						(R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) != 800)) {
 					_sceneText.setPosition(Common::Point(116, 75));
 					_sceneText.setup(ACCESS_CODE_REQUIRED);
 				} else {
@@ -7382,14 +7382,14 @@ void Scene825::doButtonPress(int buttonId) {
  *--------------------------------------------------------------------------*/
 
 bool Scene850::Indicator::startAction(CursorType action, Event &event) {
-	if ((action != CURSOR_USE) || (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) != 850))
+	if ((action != CURSOR_USE) || (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) != 850))
 		return NamedHotspot::startAction(action, event);
 	else {
 		Scene850 *scene = (Scene850 *)R2_GLOBALS._sceneManager._scene;
 
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 851;
-		scene->setAction(&scene->_sequenceManager1, scene, 851, &R2_GLOBALS._player, &scene->_fibre, NULL);
+		scene->setAction(&scene->_sequenceManager1, scene, 851, &R2_GLOBALS._player, &scene->_fiber, NULL);
 		return true;
 	}
 }
@@ -7488,10 +7488,10 @@ void Scene850::postInit(SceneObjectList *OwnerList) {
 	_panel.fixPriority(82);
 	_panel.setDetails(850, 24, -1, -1, 1, (SceneItem *)NULL);
 
-	if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBRE) == 850) {
-		_fibre.postInit();
-		_fibre.setup(850, 6, 1);
-		_fibre.setPosition(Common::Point(280, 87));
+	if (R2_INVENTORY.getObjectScene(R2_OPTICAL_FIBER) == 850) {
+		_fiber.postInit();
+		_fiber.setup(850, 6, 1);
+		_fiber.setPosition(Common::Point(280, 87));
 	}
 
 	R2_GLOBALS._player.postInit();
@@ -7538,8 +7538,8 @@ void Scene850::signal() {
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 851:
-		R2_INVENTORY.setObjectScene(R2_OPTICAL_FIBRE, 1);
-		_fibre.remove();
+		R2_INVENTORY.setObjectScene(R2_OPTICAL_FIBER, 1);
+		_fiber.remove();
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 852:
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h
index 1c8f955557..f50c9a92a2 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.h
@@ -809,7 +809,7 @@ public:
 	Button _button;
 	CableJunction _cableJunction;
 	DeviceSlot _deviceSlot;
-	SceneActor _autodocCover, _opticalFibre, _reader;
+	SceneActor _autodocCover, _opticalFiber, _reader;
 	Door _door;
 	Tray _tray;
 	ComScanner _comScanner;
@@ -885,7 +885,7 @@ public:
 	NamedHotspot _background, _eastDoor, _compartment, _sickBayIndicator;
 	NamedHotspot _liftControls;
 	Indicator _indicator;
-	SceneActor _spark, _fibre;
+	SceneActor _spark, _fiber;
 	LiftDoor _liftDoor;
 	SickBayDoor _sickBayDoor;
 	Clamp _clamp;
diff --git a/engines/tsage/scenes.cpp b/engines/tsage/scenes.cpp
index 5347c588b6..04dcd295e8 100644
--- a/engines/tsage/scenes.cpp
+++ b/engines/tsage/scenes.cpp
@@ -150,6 +150,7 @@ void SceneManager::fadeInIfNecessary() {
 
 void SceneManager::changeScene(int newSceneNumber) {
 	debug(1, "changeScene(%d)", newSceneNumber);
+	warning("Scene %d", newSceneNumber);
 	// Fade out the scene
 	ScenePalette scenePalette;
 	uint32 adjustData = 0;