[Scummvm-git-logs] scummvm master -> 496839d766a0c3d959220193a2183198f0210cec

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
496839d766 TITANIC: Merge incorrectly duplicated field in CPhotoCrosshairs


Commit: 496839d766a0c3d959220193a2183198f0210cec
    https://github.com/scummvm/scummvm/commit/496839d766a0c3d959220193a2183198f0210cec
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-05-29T00:03:22-04:00

Commit Message:
TITANIC: Merge incorrectly duplicated field in CPhotoCrosshairs

Changed paths:
    engines/titanic/star_control/photo_crosshairs.h
    engines/titanic/star_control/star_field.cpp


diff --git a/engines/titanic/star_control/photo_crosshairs.h b/engines/titanic/star_control/photo_crosshairs.h
index 82dade2..6462aee 100644
--- a/engines/titanic/star_control/photo_crosshairs.h
+++ b/engines/titanic/star_control/photo_crosshairs.h
@@ -40,7 +40,6 @@ class CStarCamera;
 class CPhotoCrosshairs {
 private:
 	Common::Array<CStarPosition> _positions;
-	int _entryIndex;
 	CStarPosition _entries[3];
 private:
 	/**
@@ -54,7 +53,7 @@ private:
 	void clear();
 public:
 	int _field8;
-	int _fieldC;
+	int _entryIndex;
 public:
 	CPhotoCrosshairs();
 	~CPhotoCrosshairs() { clear(); }
@@ -69,6 +68,11 @@ public:
 	 */
 	void save(SimpleFile *file, int indent) {}
 
+	/**
+	 * Returns true if there are no crosshairs present
+	 */
+	bool isEmpty() const { return _entryIndex == -1; }
+
 	void selectStar(int starNum, CVideoSurface *surface, CStarField *starField,
 		CStarMarkers *markers);
 
diff --git a/engines/titanic/star_control/star_field.cpp b/engines/titanic/star_control/star_field.cpp
index a8949b1..1db4c44 100644
--- a/engines/titanic/star_control/star_field.cpp
+++ b/engines/titanic/star_control/star_field.cpp
@@ -183,10 +183,10 @@ void CStarField::fn4(CSurfaceArea *surfaceArea, CStarCamera *camera) {
 
 double CStarField::fn5(CSurfaceArea *surfaceArea, CStarCamera *camera,
 		FVector &v1, FVector &v2, FVector &v3) {
-	if (_crosshairs._fieldC < 0)
+	if (_crosshairs.isEmpty())
 		return -1.0;
 
-	const CBaseStarEntry *dataP = _markers.getDataPtr(_crosshairs._fieldC);
+	const CBaseStarEntry *dataP = _markers.getDataPtr(_crosshairs._entryIndex);
 	v2 = dataP->_position;
 	FVector tv = camera->proc29(2, v2);