TITANIC: Rename CPhotoCrosshairs to CStarCrosshairs

The crosshairs are used in the main starfield as well, so they
shouldn't have a Photo specific name

5 files changed, 28 insertions, 28 deletions

diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk
index dc6b9b7f5f..1e85874fd8 100644
--- a/engines/titanic/module.mk
+++ b/engines/titanic/module.mk
@@ -443,7 +443,6 @@ MODULE_OBJS := \
 	star_control/fvector.o \
 	star_control/matrix_transform.o \
 	star_control/orientation_changer.o \
-	star_control/photo_crosshairs.o \
 	star_control/star_camera.o \
 	star_control/star_closeup.o \
 	star_control/star_control_sub2.o \
@@ -452,6 +451,7 @@ MODULE_OBJS := \
 	star_control/star_control_sub23.o \
 	star_control/star_control_sub24.o \
 	star_control/star_control_sub27.o \
+	star_control/star_crosshairs.o \
 	star_control/star_field.o \
 	star_control/star_markers.o \
 	star_control/star_points1.o \
diff --git a/engines/titanic/star_control/photo_crosshairs.cpp b/engines/titanic/star_control/star_crosshairs.cpp
index eb6268ca96..2f64505d32 100644
--- a/engines/titanic/star_control/photo_crosshairs.cpp
+++ b/engines/titanic/star_control/star_crosshairs.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "titanic/star_control/photo_crosshairs.h"
+#include "titanic/star_control/star_crosshairs.h"
 #include "titanic/star_control/star_markers.h"
 #include "titanic/star_control/star_camera.h"
 #include "titanic/star_control/star_field.h"
@@ -28,10 +28,10 @@
 
 namespace Titanic {
 
-CPhotoCrosshairs::CPhotoCrosshairs() : _matchIndex(-1), _entryIndex(-1) {
+CStarCrosshairs::CStarCrosshairs() : _matchIndex(-1), _entryIndex(-1) {
 }
 
-void CPhotoCrosshairs::selectStar(int index, CVideoSurface *surface,
+void CStarCrosshairs::selectStar(int index, CVideoSurface *surface,
 		CStarField *starField, CStarMarkers *markers) {
 	if (_entryIndex >= 0) {
 		// There are existing selected stars already
@@ -117,7 +117,7 @@ void CPhotoCrosshairs::selectStar(int index, CVideoSurface *surface,
 	}
 }
 
-bool CPhotoCrosshairs::fn1(CStarField *starField, CSurfaceArea *surfaceArea, CStarCamera *camera) {
+bool CStarCrosshairs::fn1(CStarField *starField, CSurfaceArea *surfaceArea, CStarCamera *camera) {
 	int count = starField->baseFn2(surfaceArea, camera);
 
 	if (count > 0) {
@@ -131,7 +131,7 @@ bool CPhotoCrosshairs::fn1(CStarField *starField, CSurfaceArea *surfaceArea, CSt
 	}
 }
 
-void CPhotoCrosshairs::fn2(CVideoSurface *surface, CStarField *starField, CStarMarkers *markers) {
+void CStarCrosshairs::fn2(CVideoSurface *surface, CStarField *starField, CStarMarkers *markers) {
 	if (_matchIndex <= -1) {
 		if (_entryIndex > -1) {
 			drawEntry(_entryIndex, surface, starField, markers);
@@ -146,17 +146,17 @@ void CPhotoCrosshairs::fn2(CVideoSurface *surface, CStarField *starField, CStarM
 	}
 }
 
-void CPhotoCrosshairs::incMatches() {
+void CStarCrosshairs::incMatches() {
 	if (_matchIndex < 3)
 		++_matchIndex;
 }
 
-FPoint CPhotoCrosshairs::getPosition() const {
+FPoint CStarCrosshairs::getPosition() const {
 	return (_entryIndex >= 0 && _entryIndex <= 2) ? 
 		FPoint(_entries[_entryIndex]) : FPoint();
 }
 
-void CPhotoCrosshairs::draw(CSurfaceArea *surfaceArea) {
+void CStarCrosshairs::draw(CSurfaceArea *surfaceArea) {
 	if (!_positions.empty()) {
 		uint savedPixel = surfaceArea->_pixel;
 		surfaceArea->_pixel = 0xff;
@@ -179,7 +179,7 @@ void CPhotoCrosshairs::draw(CSurfaceArea *surfaceArea) {
 	}
 }
 
-void CPhotoCrosshairs::allocate(int count) {
+void CStarCrosshairs::allocate(int count) {
 	if (!_positions.empty()) {
 		if ((int)_positions.size() == count)
 			return;
@@ -190,12 +190,12 @@ void CPhotoCrosshairs::allocate(int count) {
 	_positions.resize(count);
 }
 
-void CPhotoCrosshairs::clear() {
+void CStarCrosshairs::clear() {
 	_positions.clear();
 	_matchIndex = _entryIndex = -1;
 }
 
-int CPhotoCrosshairs::indexOf(const Common::Point &pt) const {
+int CStarCrosshairs::indexOf(const Common::Point &pt) const {
 	Common::Rect r(pt.x - 2, pt.y - 2, pt.x + 2, pt.y + 2);
 
 	for (int idx = 0; idx < (int)_positions.size(); ++idx) {
@@ -206,14 +206,14 @@ int CPhotoCrosshairs::indexOf(const Common::Point &pt) const {
 	return -1;
 }
 
-void CPhotoCrosshairs::drawStar(int index, CSurfaceArea *surfaceArea) {
+void CStarCrosshairs::drawStar(int index, CSurfaceArea *surfaceArea) {
 	if (index >= 0 && index < (int)_positions.size()) {
 		const CStarPosition &pt = _positions[index];
 		drawAt(pt, surfaceArea);
 	}
 }
 
-void CPhotoCrosshairs::drawEntry(int index, CVideoSurface *surface, CStarField *starField, CStarMarkers *markers) {
+void CStarCrosshairs::drawEntry(int index, CVideoSurface *surface, CStarField *starField, CStarMarkers *markers) {
 	surface->lock();
 	CSurfaceArea surfaceArea(surface);
 	drawAt(_entries[index], &surfaceArea);
@@ -223,13 +223,13 @@ void CPhotoCrosshairs::drawEntry(int index, CVideoSurface *surface, CStarField *
 	markers->addStar(starP);
 }
 
-void CPhotoCrosshairs::eraseCurrent(CSurfaceArea *surfaceArea) {
+void CStarCrosshairs::eraseCurrent(CSurfaceArea *surfaceArea) {
 	assert(_entryIndex >= 0);
 	const CStarPosition &pt = _entries[_entryIndex];
 	drawAt(pt, surfaceArea);
 }
 
-void CPhotoCrosshairs::drawAt(const FPoint &pt, CSurfaceArea *surfaceArea) {
+void CStarCrosshairs::drawAt(const FPoint &pt, CSurfaceArea *surfaceArea) {
 	uint savedPixel = surfaceArea->_pixel;
 	surfaceArea->_pixel = 255;
 	surfaceArea->setColorFromPixel();
diff --git a/engines/titanic/star_control/photo_crosshairs.h b/engines/titanic/star_control/star_crosshairs.h
index 9f78a2d760..e91e245ad1 100644
--- a/engines/titanic/star_control/photo_crosshairs.h
+++ b/engines/titanic/star_control/star_crosshairs.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef TITANIC_PHOTO_CROSSHAIRS_H
-#define TITANIC_PHOTO_CROSSHAIRS_H
+#ifndef TITANIC_STAR_CROSSHAIRS_H
+#define TITANIC_STAR_CROSSHAIRS_H
 
 #include "common/array.h"
 #include "common/rect.h"
@@ -37,7 +37,7 @@ class CStarField;
 class CStarMarkers;
 class CStarCamera;
 
-class CPhotoCrosshairs {
+class CStarCrosshairs {
 private:
 	Common::Array<CStarPosition> _positions;
 	CStarPosition _entries[3];
@@ -55,8 +55,8 @@ public:
 	int _matchIndex;
 	int _entryIndex;
 public:
-	CPhotoCrosshairs();
-	~CPhotoCrosshairs() { clear(); }
+	CStarCrosshairs();
+	~CStarCrosshairs() { clear(); }
 
 	/**
 	 * Load the data for the class from file
@@ -125,4 +125,4 @@ public:
 
 } // End of namespace Titanic
 
-#endif /* TITANIC_PHOTO_CROSSHAIRS_H */
+#endif /* TITANIC_STAR_CROSSHAIRS_H */
diff --git a/engines/titanic/star_control/star_field.cpp b/engines/titanic/star_control/star_field.cpp
index aad6382d5d..669423bc60 100644
--- a/engines/titanic/star_control/star_field.cpp
+++ b/engines/titanic/star_control/star_field.cpp
@@ -67,7 +67,7 @@ void CStarField::render(CVideoSurface *surface, CStarCamera *camera) {
 	CSurfaceArea surfaceArea(surface);
 	draw(&surfaceArea, camera, &_starCloseup);
 	if (_showCrosshairs)
-		drawCrosshairs(&surfaceArea);
+		drawBox(&surfaceArea);
 
 	_markers.draw(&surfaceArea, camera, nullptr);
 	_crosshairs.draw(&surfaceArea);
@@ -142,7 +142,7 @@ void CStarField::fn1(CErrorCode *errorCode) {
 	_starCloseup.proc3(errorCode);
 }
 
-void CStarField::drawCrosshairs(CSurfaceArea *surfaceArea) {
+void CStarField::drawBox(CSurfaceArea *surfaceArea) {
 	uint oldPixel = surfaceArea->_pixel;
 	surfaceArea->_pixel = 0x323232;
 	surfaceArea->setColorFromPixel();
diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h
index a014894ef4..ecac23eac3 100644
--- a/engines/titanic/star_control/star_field.h
+++ b/engines/titanic/star_control/star_field.h
@@ -26,7 +26,7 @@
 #include "titanic/star_control/star_control_sub2.h"
 #include "titanic/star_control/star_closeup.h"
 #include "titanic/star_control/star_markers.h"
-#include "titanic/star_control/photo_crosshairs.h"
+#include "titanic/star_control/star_crosshairs.h"
 #include "titanic/star_control/star_points1.h"
 #include "titanic/star_control/star_points2.h"
 
@@ -35,7 +35,7 @@ namespace Titanic {
 class CStarField : public CStarControlSub2 {
 private:
 	CStarMarkers _markers;
-	CPhotoCrosshairs _crosshairs;
+	CStarCrosshairs _crosshairs;
 	CStarPoints1 _points1;
 	CStarPoints2 _points2;
 	CStarCloseup _starCloseup;
@@ -47,9 +47,9 @@ private:
 	bool _isSolved;
 private:
 	/**
-	 * Draws the square box crosshairs in the middle of the screen
+	 * Draws the big square box in the middle of the screen
 	 */
-	void drawCrosshairs(CSurfaceArea *surfaceArea);
+	void drawBox(CSurfaceArea *surfaceArea);
 
 	void fn4(CSurfaceArea *surfaceArea, CStarCamera *camera);
 public: