TSAGE: R2R - Minor cleanup: update some todos, use american instead of british english, ...

7 files changed, 20 insertions, 20 deletions

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 6503e928f4..768c51ca16 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -422,7 +422,7 @@ Ringworld2Globals::Ringworld2Globals() {
 	_sounds.push_back(&_sound3);
 	_sounds.push_back(&_sound4);
 
-	// Initialise fields
+	// Initialize fields
 	_stripModifier = 0;
 	_flubMazeArea = 1;
 	_flubMazeEntryDirection = 0;
@@ -509,7 +509,7 @@ void Ringworld2Globals::reset() {
 	_spillLocation[12] = 27;
 	_spillLocation[13] = 31;
 
-	// Initialise the vampire data within the Flub maze
+	// Initialize the vampire data within the Flub maze
 	for (int i = 0; i < 18; i++) {
 		_vampireData[i]._isAlive = true;
 		_vampireData[i]._position = Common::Point();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index f88e1703a3..36d48ca27a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -103,7 +103,7 @@ void Scene1000::signal() {
 
 	switch (_sceneMode++) {
 	case 0:
-		// TODO: Sort out values
+		// TODO: Determine correct colors
 		R2_GLOBALS._gfxColors.foreground = 191;
 		R2_GLOBALS._gfxColors.background = 144;
 		R2_GLOBALS._fontColors.background = 224;
@@ -128,7 +128,7 @@ void Scene1000::signal() {
 	case 1:
 		R2_GLOBALS._sound1.fadeOut2(NULL);
 
-		// TODO: Sort out values
+		// TODO: Determine correct colors
 		R2_GLOBALS._gfxColors.foreground = 191;
 		R2_GLOBALS._gfxColors.background = 144;
 		R2_GLOBALS._fontColors.background = 224;
@@ -157,7 +157,7 @@ void Scene1000::signal() {
 		break;
 
 	case 3:
-		// TODO: Sort out values
+		// TODO: Determine correct colors
 		R2_GLOBALS._gfxColors.foreground = 191;
 		R2_GLOBALS._gfxColors.background = 144;
 		R2_GLOBALS._fontColors.background = 224;
@@ -184,7 +184,7 @@ void Scene1000::signal() {
 		break;
 
 	case 4:
-		// TODO: Sort out values
+		// TODO: Determine correct colors
 		R2_GLOBALS._gfxColors.foreground = 191;
 		R2_GLOBALS._gfxColors.background = 144;
 		R2_GLOBALS._fontColors.background = 224;
@@ -9426,8 +9426,7 @@ void Scene1575::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_field41A);
 }
 
-// TODO: Remove this method stub with proper sub-method call
-double unk(double v1, double v2) {
+double hypotenuse(double v1, double v2) {
 	return sqrt(v1 * v1 + v2 * v2);
 }
 
@@ -9456,8 +9455,8 @@ void Scene1575::postInit(SceneObjectList *OwnerList) {
 		_arrActor[i].postInit();
 		_arrActor[i].setup(1575, 2, k5A7F6[3 * i + 2]);
 
-		double v1 = unk(2.0, 3 - k5A7F6[3 * i]);
-		v1 += unk(2.0, 3 - k5A7F6[3 * i + 1]);
+		double v1 = hypotenuse(2.0, 3 - k5A7F6[3 * i]);
+		v1 += hypotenuse(2.0, 3 - k5A7F6[3 * i + 1]);
 		int yp = (int)(sqrt(v1) * 75.0 / 17.0 - 161.0);
 
 		int angle = R2_GLOBALS._gfxManagerInstance.getAngle(
@@ -9496,7 +9495,7 @@ void Scene1575::postInit(SceneObjectList *OwnerList) {
 	_actor10.setup(1575, 3, 2);
 	_actor10.setPosition(Common::Point(287, 91));
 
-	// Initialise buttons
+	// Initialize buttons
 	_button1.initButton(1);
 	_button2.initButton(2);
 	_button3.initButton(3);
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 4022e1fc09..6cb14774ba 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -4969,7 +4969,7 @@ void Scene2900::synchronize(Serializer &s) {
 
 void Scene2900::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._uiElements._active = false;
-	// TODO: Determine correct colours
+	// TODO: Determine correct colors
 	R2_GLOBALS._gfxColors.foreground = 228;
 	R2_GLOBALS._fontColors.background = 12;
 	R2_GLOBALS._fontColors.foreground = 22;
@@ -5075,7 +5075,7 @@ void Scene2900::postInit(SceneObjectList *OwnerList) {
 }
 
 void Scene2900::remove() {
-	// TODO: Figure out correct colours
+	// TODO: Figure out correct colors
 	R2_GLOBALS._gfxColors.foreground = 59;
 	R2_GLOBALS._fontColors.background = 4;
 	R2_GLOBALS._fontColors.foreground = 15;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index d7ee79906a..ab6da047ce 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -3521,7 +3521,7 @@ Scene3500::Scene3500() {
 	_nextMove = 0;
 	_mazePosition.x = 0;
 	_mazePosition.y = 0;
-	_field1282 = 0;
+	_field1282 = true; // Set to true in fixup()
 	_field1284 = 0;
 	_directionChangesEnabled = false;
 }
@@ -3557,7 +3557,7 @@ void Scene3500::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player._characterScene[R2_SEEKER] = 3500;
 	R2_GLOBALS._player._characterScene[R2_MIRANDA] = 3500;
 	_field1284 = 0;
-	_field1282 = 0;
+	_field1282 = false;
 	_nextMove = 0;
 	_field1272 = true;
 	_speed = 4;
@@ -3880,11 +3880,11 @@ void Scene3500::dispatch() {
 	int tmpCellId = 0;
 	int cellId = 0;
 
-	if ((_mazeChangeAmount == 0) && (_field1282 == 0)) {
+	if ((_mazeChangeAmount == 0) && !_field1282) {
 		if (_field1284 == 2)
 			R2_GLOBALS._sceneManager.changeScene(1000);
 	} else {
-		_field1282 = 0;
+		_field1282 = false;
 		tmpRect.set(160, 89, 299, 182);
 
 		newMazeX = _mazePosition.x;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.h b/engines/tsage/ringworld2/ringworld2_scenes3.h
index 834a601e62..b282900c3a 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.h
@@ -657,7 +657,7 @@ public:
 	int _mazeDirection;
 	int _nextMove;
 	Common::Point _mazePosition;
-	int _field1282; // TODO: Set to true in Fixup()
+	bool _field1282;
 	int _field1284;
 	bool _directionChangesEnabled;
 
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 5fd935f8cd..49359bb351 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -71,7 +71,8 @@ void VisualSpeaker::remove() {
 }
 
 void VisualSpeaker::signal() {
-	// TODO: _action->_field18 = 1;
+	// TODO: Handle _field18 if used in Action. It looks only used in the original in remove()
+	// _action->_field18 = 1;
 	if (_speakerMode == 0xff)
 		stopSpeaking();
 
diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp
index 9956d5c7fb..37e96c75e0 100644
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@ -125,7 +125,7 @@ void TSageEngine::deinitialize() {
 }
 
 Common::Error TSageEngine::run() {
-	// Basic initialisation
+	// Basic initialization
 	initialize();
 
 	g_globals->_sceneHandler->registerHandler();