[Scummvm-git-logs] scummvm master -> 0e0500f06546189fa6dcae0f1714f7a0b1c4e0eb

[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:
0e0500f065 TITANIC: Compilation fix in addStar method


Commit: 0e0500f06546189fa6dcae0f1714f7a0b1c4e0eb
    https://github.com/scummvm/scummvm/commit/0e0500f06546189fa6dcae0f1714f7a0b1c4e0eb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-08T23:53:39-05:00

Commit Message:
TITANIC: Compilation fix in addStar method

Changed paths:
    engines/titanic/star_control/base_star.cpp
    engines/titanic/star_control/base_star.h
    engines/titanic/star_control/star_control_sub7.cpp


diff --git a/engines/titanic/star_control/base_star.cpp b/engines/titanic/star_control/base_star.cpp
index e68d3cf..a32263a 100644
--- a/engines/titanic/star_control/base_star.cpp
+++ b/engines/titanic/star_control/base_star.cpp
@@ -195,8 +195,9 @@ void CBaseStar::baseFn1(int v1, int v2, int v3, int v4) {
 	// TODO
 }
 
-void CBaseStar::baseFn2(int v1, int v2) {
+int CBaseStar::baseFn2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12) {
 	// TODO
+	return 0;
 }
 
 } // End of namespace Titanic
diff --git a/engines/titanic/star_control/base_star.h b/engines/titanic/star_control/base_star.h
index ec27ffa..1450b25 100644
--- a/engines/titanic/star_control/base_star.h
+++ b/engines/titanic/star_control/base_star.h
@@ -78,7 +78,7 @@ protected:
 	void resetEntry(CBaseStarEntry &entry);
 
 	void baseFn1(int v1, int v2, int v3, int v4);
-	void baseFn2(int v1, int v2);
+	int baseFn2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12);
 public:
 	CBaseStar();
 	virtual ~CBaseStar() {}
diff --git a/engines/titanic/star_control/star_control_sub7.cpp b/engines/titanic/star_control/star_control_sub7.cpp
index 7da2592..4b69481 100644
--- a/engines/titanic/star_control/star_control_sub7.cpp
+++ b/engines/titanic/star_control/star_control_sub7.cpp
@@ -32,10 +32,10 @@ bool CStarControlSub7::addStar(const CBaseStarEntry *entry) {
 	// iterate through the existing stars
 	for (uint idx = 0; idx < _data.size(); ++idx) {
 		CBaseStarEntry &star = _data[idx];
-		if (star == *entry) {
+		if (star._position == entry->_position) {
 			// Found a matching star at the exact same position, so remove it instead
 			_data.remove_at(idx);
-			return;
+			return true;
 		}
 	}