TITANIC: Rename CStarControlSub5 to CStarCloseup

9 files changed, 71 insertions, 63 deletions

diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index 42a67c85ad..0b32265933 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -440,8 +440,8 @@ MODULE_OBJS := \
 	star_control/frange.o \
 	star_control/frect.o \
 	star_control/fvector.o \
+	star_control/star_closeup.o \
 	star_control/star_control_sub2.o \
-	star_control/star_control_sub5.o \
 	star_control/star_control_sub7.o \
 	star_control/star_control_sub8.o \
 	star_control/star_control_sub12.o \
diff --git a/engines/titanic/star_control/base_star.cpp b/engines/titanic/star_control/base_star.cpp
index c9ea3eb51f..e6a7b48e03 100644
--- a/engines/titanic/star_control/base_star.cpp
+++ b/engines/titanic/star_control/base_star.cpp
@@ -123,16 +123,16 @@ void CBaseStar::resetEntry(CBaseStarEntry &entry) {
 		entry._data[idx] = 0;
 }
 
-void CBaseStar::draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5) {
+void CBaseStar::draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup) {
 	if (!_data.empty()) {
 		switch (sub12->proc27()) {
 		case 0:
 			switch (surfaceArea->_bpp) {
 			case 1:
-				draw1(surfaceArea, sub12, sub5);
+				draw1(surfaceArea, sub12, closeup);
 				break;
 			case 2:
-				draw2(surfaceArea, sub12, sub5);
+				draw2(surfaceArea, sub12, closeup);
 				break;
 			default:
 				break;
@@ -142,10 +142,10 @@ void CBaseStar::draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarC
 		case 2:
 			switch (surfaceArea->_bpp) {
 			case 1:
-				draw3(surfaceArea, sub12, sub5);
+				draw3(surfaceArea, sub12, closeup);
 				break;
 			case 2:
-				draw4(surfaceArea, sub12, sub5);
+				draw4(surfaceArea, sub12, closeup);
 				break;
 			default:
 				break;
@@ -158,7 +158,7 @@ void CBaseStar::draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarC
 	}
 }
 
-void CBaseStar::draw1(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5) {
+void CBaseStar::draw1(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup) {
 	FPose pose = sub12->proc23();
 	sub12->proc36(&_value1, &_value2, &_value3, &_value4);
 
@@ -184,7 +184,7 @@ void CBaseStar::draw1(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 		total2 = tempY * tempY + tempX * tempX + tempZ * tempZ; 
 
 		if (total2 < 1.0e12) {
-			sub5->proc2(pose, vector, centroid._x, centroid._y, total2,
+			closeup->draw(pose, vector, FVector(centroid._x, centroid._y, total2),
 				surfaceArea, sub12);
 			continue;
 		}
@@ -243,7 +243,7 @@ void CBaseStar::draw1(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 	}
 }
 
-void CBaseStar::draw2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5) {
+void CBaseStar::draw2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup) {
 	FPose pose = sub12->proc23();
 	sub12->proc36(&_value1, &_value2, &_value3, &_value4);
 
@@ -269,7 +269,7 @@ void CBaseStar::draw2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 		total2 = tempY * tempY + tempX * tempX + tempZ * tempZ;
 
 		if (total2 < 1.0e12) {
-			sub5->proc2(pose, vector, centroid._x, centroid._y, total2,
+			closeup->draw(pose, vector, FVector(centroid._x, centroid._y, total2),
 				surfaceArea, sub12);
 			continue;
 		}
@@ -329,7 +329,7 @@ void CBaseStar::draw2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 	}
 }
 
-void CBaseStar::draw3(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5) {
+void CBaseStar::draw3(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup) {
 	FPose pose = sub12->proc23();
 	sub12->proc36(&_value1, &_value2, &_value3, &_value4);
 
@@ -358,7 +358,7 @@ void CBaseStar::draw3(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 		total2 = tempY * tempY + tempX * tempX + tempZ * tempZ;
 
 		if (total2 < 1.0e12) {
-			sub5->proc2(pose, vector, centroid._x, centroid._y, total2,
+			closeup->draw(pose, vector, FVector(centroid._x, centroid._y, total2),
 				surfaceArea, sub12);
 			continue;
 		}
@@ -436,7 +436,7 @@ void CBaseStar::draw3(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 	}
 }
 
-void CBaseStar::draw4(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5) {
+void CBaseStar::draw4(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup) {
 	FPose pose = sub12->proc23();
 	sub12->proc36(&_value1, &_value2, &_value3, &_value4);
 
@@ -465,7 +465,7 @@ void CBaseStar::draw4(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStar
 		total2 = tempY * tempY + tempX * tempX + tempZ * tempZ;
 
 		if (total2 < 1.0e12) {
-			sub5->proc2(pose, vector, centroid._x, centroid._y, total2,
+			closeup->draw(pose, vector, FVector(centroid._x, centroid._y, total2),
 				surfaceArea, sub12);
 			continue;
 		}
diff --git a/engines/titanic/star_control/base_star.h b/engines/titanic/star_control/base_star.h
index 2dd828ef18..81bdb4d71d 100644
--- a/engines/titanic/star_control/base_star.h
+++ b/engines/titanic/star_control/base_star.h
@@ -25,7 +25,7 @@
 
 #include "titanic/support/simple_file.h"
 #include "titanic/star_control/frange.h"
-#include "titanic/star_control/star_control_sub5.h"
+#include "titanic/star_control/star_closeup.h"
 #include "titanic/star_control/surface_area.h"
 
 namespace Titanic {
@@ -65,10 +65,10 @@ struct CStarPosition : public Common::Point {
 
 class CBaseStar {
 private:
-	void draw1(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5);
-	void draw2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5);
-	void draw3(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5);
-	void draw4(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5);
+	void draw1(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup);
+	void draw2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup);
+	void draw3(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup);
+	void draw4(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup);
 protected:
 	FRange _minMax;
 	double _minVal;
@@ -100,7 +100,7 @@ public:
 	/**
 	 * Draw the item
 	 */
-	virtual void draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5);
+	virtual void draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup);
 
 	virtual bool loadYale(int v1) { return true; }
 
diff --git a/engines/titanic/star_control/star_control_sub5.cpp b/engines/titanic/star_control/star_closeup.cpp
index 2fd8a119dd..9128c2d89e 100644
--- a/engines/titanic/star_control/star_control_sub5.cpp
+++ b/engines/titanic/star_control/star_closeup.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/star_control/star_control_sub5.h"
+#include "titanic/star_control/star_closeup.h"
 #include "titanic/star_control/star_control_sub12.h"
 #include "titanic/titanic.h"
 
@@ -28,14 +28,14 @@ namespace Titanic {
 
 #define MKTAG_BE(a3,a2,a1,a0) ((uint32)((a3) | ((a2) << 8) | ((a1) << 16) | ((a0) << 24)))
 
-void CStarControlSub5::SubEntry::clear() {
+void CStarCloseup::SubEntry::clear() {
 	_data1.clear();
 	_data2.clear();
 }
 
 /*------------------------------------------------------------------------*/
 
-bool CStarControlSub5::SineTable::setup() {
+bool CStarCloseup::SineTable::setup() {
 	if (_data.empty()) {
 		_data.resize(1024);
 		for (int idx = 0; idx < 1024; ++idx)
@@ -47,10 +47,10 @@ bool CStarControlSub5::SineTable::setup() {
 
 /*------------------------------------------------------------------------*/
 
-CStarControlSub5::CStarControlSub5() : _flag(true), _multiplier(0) {
+CStarCloseup::CStarCloseup() : _flag(true), _multiplier(0) {
 }
 
-bool CStarControlSub5::setup() {
+bool CStarCloseup::setup() {
 	bool success = setupEntry(5, 5, 4, 1024.0)
 		&& setupEntry(7, 7, 3, 1024.0)
 		&& setupEntry(8, 8, 2, 1024.0)
@@ -62,7 +62,7 @@ bool CStarControlSub5::setup() {
 	return success;
 }
 
-bool CStarControlSub5::setup2(int val1, int val2) {
+bool CStarCloseup::setup2(int val1, int val2) {
 	const double FACTOR = 2 * M_PI / 360.0;
 	const int VALUES1[] = { 0x800, 0xC00, 0x1000, 0x1400, 0x1800 };
 	const int VALUES2[] = {
@@ -189,7 +189,7 @@ bool CStarControlSub5::setup2(int val1, int val2) {
 	return false;
 }
 
-void CStarControlSub5::proc2(const FPose &pose, const FVector &vector, double v1, double v2, double v3,
+void CStarCloseup::draw(const FPose &pose, const FVector &vector, const FVector &vector2,
 		CSurfaceArea *surfaceArea, CStarControlSub12 *sub12) {
 	const int VALUES[] = { 0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4 };
 	double val1 = sub12->proc25();
@@ -205,7 +205,7 @@ void CStarControlSub5::proc2(const FPose &pose, const FVector &vector, double v1
 	double f41, f42, f43, f44, f45, f46;
 	FVector tempV;
 
-	if (v3 >= 6.0e9) {
+	if (vector2._z >= 6.0e9) {
 		int count, start;
 		if (vector._x != 0.0 && (vector._y != 0.0 || vector._z != 0.0)) {
 			// WORKAROUND: Ignoring non-sensical randSeed((int)vector._x);
@@ -320,7 +320,7 @@ void CStarControlSub5::proc2(const FPose &pose, const FVector &vector, double v1
 					GridEntry &gridEntry = _grid[ctr2];
 					tempV = sub12->proc28(2, gridEntry);
 					gridEntry._position._x = tempV._x;
-					gridEntry._position._y = tempV._y + v2;
+					gridEntry._position._y = tempV._y + vector2._y;
 				}
 
 				for (int ctr2 = 0; ctr2 < size1; ++ctr2) {
@@ -341,8 +341,8 @@ void CStarControlSub5::proc2(const FPose &pose, const FVector &vector, double v1
 				for (int ctr2 = 0; ctr2 < size2; ++ctr2) {
 					GridEntry &gridEntry = _grid[ctr2];
 					tempV = sub12->proc28(0, gridEntry);
-					gridEntry._position._x = tempV._x + v1;
-					gridEntry._position._y = tempV._y + v2;
+					gridEntry._position._x = tempV._x + vector2._x;
+					gridEntry._position._y = tempV._y + vector2._y;
 				}
 
 				for (int ctr2 = 0; ctr2 < size1; ++ctr2) {
@@ -363,8 +363,8 @@ void CStarControlSub5::proc2(const FPose &pose, const FVector &vector, double v1
 				for (int ctr2 = 0; ctr2 < size2; ++ctr2) {
 					GridEntry &gridEntry = _grid[ctr2];
 					tempV = sub12->proc28(1, gridEntry);
-					gridEntry._position._x = tempV._x + v1;
-					gridEntry._position._y = tempV._y + v2;
+					gridEntry._position._x = tempV._x + vector2._x;
+					gridEntry._position._y = tempV._y + vector2._y;
 				}
 
 				for (int ctr2 = 0; ctr2 < size1; ++ctr2) {
@@ -384,11 +384,11 @@ void CStarControlSub5::proc2(const FPose &pose, const FVector &vector, double v1
 	uint pixel1 = 0x81EEF5, pixel2 = 0xF5, pixel3 = 0x810000;
 	int arrIndex = 0;
 
-	if (v3 >= 200000000.0) {
-		if (v3 >= 900000000.0) {
-			if (v3 >= 6000000000.0) {
+	if (vector2._z >= 200000000.0) {
+		if (vector2._z >= 900000000.0) {
+			if (vector2._z >= 6000000000.0) {
 				arrIndex = 3;
-				if (v3 >= 1.0e10)
+				if (vector2._z >= 1.0e10)
 					arrIndex = 4;
 			} else {
 				arrIndex = 2;
@@ -433,8 +433,8 @@ void CStarControlSub5::proc2(const FPose &pose, const FVector &vector, double v1
 		for (uint ctr = 0; ctr < entry._data2.size(); ++ctr) {
 			GridEntry &gridEntry = _grid[ctr];
 			tempV = sub12->proc28(2, gridEntry);
-			gridEntry._position._x = tempV._x + v1;
-			gridEntry._position._y = tempV._y + v2;
+			gridEntry._position._x = tempV._x + vector2._x;
+			gridEntry._position._y = tempV._y + vector2._y;
 		}
 
 		for (uint ctr = 0; ctr < entry._data1.size(); ++ctr) {
@@ -455,8 +455,8 @@ void CStarControlSub5::proc2(const FPose &pose, const FVector &vector, double v1
 		for (uint ctr = 0; ctr < entry._data2.size(); ++ctr) {
 			GridEntry &gridEntry = _grid[ctr];
 			tempV = sub12->proc28(2, gridEntry);
-			gridEntry._position._x = tempV._x + v1;
-			gridEntry._position._y = tempV._y + v2;
+			gridEntry._position._x = tempV._x + vector2._x;
+			gridEntry._position._y = tempV._y + vector2._y;
 		}
 
 		for (uint ctr = 0; ctr < entry._data1.size(); ++ctr) {
@@ -477,8 +477,8 @@ void CStarControlSub5::proc2(const FPose &pose, const FVector &vector, double v1
 		for (uint ctr = 0; ctr < entry._data2.size(); ++ctr) {
 			GridEntry &gridEntry = _grid[ctr];
 			tempV = sub12->proc28(2, gridEntry);
-			gridEntry._position._x = tempV._x + v1;
-			gridEntry._position._y = tempV._y + v2;
+			gridEntry._position._x = tempV._x + vector2._x;
+			gridEntry._position._y = tempV._y + vector2._y;
 		}
 
 		for (uint ctr = 0; ctr < entry._data1.size(); ++ctr) {
@@ -494,16 +494,16 @@ void CStarControlSub5::proc2(const FPose &pose, const FVector &vector, double v1
 	}
 }
 
-void CStarControlSub5::proc3(CErrorCode *errorCode) {
+void CStarCloseup::proc3(CErrorCode *errorCode) {
 	++_multiplier;
 	errorCode->set();
 }
 
-void CStarControlSub5::fn1() {
+void CStarCloseup::fn1() {
 	_flag = !_flag;
 }
 
-bool CStarControlSub5::setupEntry(int width, int height, int index, double val) {
+bool CStarCloseup::setupEntry(int width, int height, int index, double val) {
 	if (width < 2 || height < 3)
 		return false;
 
diff --git a/engines/titanic/star_control/star_control_sub5.h b/engines/titanic/star_control/star_closeup.h
index 25aafa87c8..3f4541f66d 100644
--- a/engines/titanic/star_control/star_control_sub5.h
+++ b/engines/titanic/star_control/star_closeup.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef TITANIC_STAR_CONTROL_SUB5_H
-#define TITANIC_STAR_CONTROL_SUB5_H
+#ifndef TITANIC_STAR_CLOSEUP_H
+#define TITANIC_STAR_CLOSEUP_H
 
 #include "common/array.h"
 #include "titanic/star_control/fvector.h"
@@ -33,7 +33,10 @@ namespace Titanic {
 
 class CStarControlSub12;
 
-class CStarControlSub5 {
+/**
+ * Handles drawing a 3D rendered closeup of a star
+ */
+class CStarCloseup {
 	struct Data1 {
 		int _index1;
 		int _index2;
@@ -112,12 +115,17 @@ private:
 	 */
 	bool setup2(int val1, int val2);
 public:
-	CStarControlSub5();
-	virtual ~CStarControlSub5() {}
+	CStarCloseup();
+	virtual ~CStarCloseup() {}
 
 	virtual bool setup();
-	virtual void proc2(const FPose &pose, const FVector &vector, double v1, double v2, double v3,
+
+	/**
+	 * Draws the star globe
+	 */
+	virtual void draw(const FPose &pose, const FVector &vector, const FVector &vector2,
 		CSurfaceArea *surfaceArea, CStarControlSub12 *sub12);
+
 	virtual void proc3(CErrorCode *errorCode);
 
 	bool get4() const { return _flag; }
@@ -128,4 +136,4 @@ public:
 
 } // End of namespace Titanic
 
-#endif /* TITANIC_STAR_CONTROL_SUB5_H */
+#endif /* TITANIC_STAR_CLOSEUP_H */
diff --git a/engines/titanic/star_control/star_control_sub7.cpp b/engines/titanic/star_control/star_control_sub7.cpp
index 3324711160..257c2034dc 100644
--- a/engines/titanic/star_control/star_control_sub7.cpp
+++ b/engines/titanic/star_control/star_control_sub7.cpp
@@ -25,7 +25,7 @@
 
 namespace Titanic {
 
-void CStarControlSub7::draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5) {
+void CStarControlSub7::draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup) {
 	if (_data.empty())
 		return;
 
diff --git a/engines/titanic/star_control/star_control_sub7.h b/engines/titanic/star_control/star_control_sub7.h
index 619e779075..b884400a9a 100644
--- a/engines/titanic/star_control/star_control_sub7.h
+++ b/engines/titanic/star_control/star_control_sub7.h
@@ -33,7 +33,7 @@ public:
 	/**
 	 * Draw the item
 	 */
-	virtual void draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarControlSub5 *sub5);
+	virtual void draw(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12, CStarCloseup *closeup);
 
 	/**
 	 * Adds a new star, or removes one if already present at the given co-ordinates
diff --git a/engines/titanic/star_control/star_field.cpp b/engines/titanic/star_control/star_field.cpp
index d7e4935895..3890b04eb4 100644
--- a/engines/titanic/star_control/star_field.cpp
+++ b/engines/titanic/star_control/star_field.cpp
@@ -54,7 +54,7 @@ void CStarField::save(SimpleFile *file, int indent) {
 bool CStarField::initDocument() {
 	bool valid = setup() && _points1.initialize();
 	if (valid)
-		valid = _sub5.setup();
+		valid = _starCloseup.setup();
 	if (valid)
 		valid = _points1.initialize();
 	if (valid)
@@ -65,7 +65,7 @@ bool CStarField::initDocument() {
 
 void CStarField::render(CVideoSurface *surface, CStarControlSub12 *sub12) {
 	CSurfaceArea surfaceArea(surface);
-	draw(&surfaceArea, sub12, &_sub5);
+	draw(&surfaceArea, sub12, &_starCloseup);
 	if (_showCrosshairs)
 		drawCrosshairs(&surfaceArea);
 
@@ -97,11 +97,11 @@ void CStarField::set2(int val) {
 }
 
 int CStarField::get54() const {
-	return _sub5.get4();
+	return _starCloseup.get4();
 }
 
 void CStarField::set54(int val) {
-	_sub5.set4(val);
+	_starCloseup.set4(val);
 }
 
 StarMode CStarField::getMode() const {
@@ -139,7 +139,7 @@ bool CStarField::isSolved() const {
 }
 
 void CStarField::fn1(CErrorCode *errorCode) {
-	_sub5.proc3(errorCode);
+	_starCloseup.proc3(errorCode);
 }
 
 void CStarField::drawCrosshairs(CSurfaceArea *surfaceArea) {
diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h
index 40ec9fa6c5..82acbed57d 100644
--- a/engines/titanic/star_control/star_field.h
+++ b/engines/titanic/star_control/star_field.h
@@ -24,7 +24,7 @@
 #define TITANIC_STAR_FIELD_H
 
 #include "titanic/star_control/star_control_sub2.h"
-#include "titanic/star_control/star_control_sub5.h"
+#include "titanic/star_control/star_closeup.h"
 #include "titanic/star_control/star_control_sub7.h"
 #include "titanic/star_control/star_control_sub8.h"
 #include "titanic/star_control/star_points1.h"
@@ -38,7 +38,7 @@ private:
 	CStarControlSub8 _sub8;
 	CStarPoints1 _points1;
 	CStarPoints2 _points2;
-	CStarControlSub5 _sub5;
+	CStarCloseup _starCloseup;
 	bool _points1On;
 	bool _points2On;
 	StarMode _mode;
@@ -122,7 +122,7 @@ public:
 	void fn6(CVideoSurface *surface, CStarControlSub12 *sub12);
 	void fn7();
 	void fn8(CVideoSurface *surface);
-	void fn9() { _sub5.fn1(); }
+	void fn9() { _starCloseup.fn1(); }
 
 	/**
 	 * Called when the starfield is clicked