aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2017-03-08 23:53:39 -0500
committerPaul Gilbert2017-03-08 23:53:39 -0500
commit0e0500f06546189fa6dcae0f1714f7a0b1c4e0eb (patch)
tree485fb1821d6d62cc363aa3ec4603c06d03302deb /engines
parent4daf983b2e7aea5516f2a6bc55bf0ac06742e19e (diff)
downloadscummvm-rg350-0e0500f06546189fa6dcae0f1714f7a0b1c4e0eb.tar.gz
scummvm-rg350-0e0500f06546189fa6dcae0f1714f7a0b1c4e0eb.tar.bz2
scummvm-rg350-0e0500f06546189fa6dcae0f1714f7a0b1c4e0eb.zip
TITANIC: Compilation fix in addStar method
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/star_control/base_star.cpp3
-rw-r--r--engines/titanic/star_control/base_star.h2
-rw-r--r--engines/titanic/star_control/star_control_sub7.cpp4
3 files changed, 5 insertions, 4 deletions
diff --git a/engines/titanic/star_control/base_star.cpp b/engines/titanic/star_control/base_star.cpp
index e68d3cf9a6..a32263a926 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 ec27ffa66b..1450b25bb3 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 7da2592597..4b694810ad 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;
}
}