Skip to content
Permalink
Browse files

TITANIC: Compilation fix in addStar method

  • Loading branch information
dreammaster committed Mar 9, 2017
1 parent 4daf983 commit 0e0500f06546189fa6dcae0f1714f7a0b1c4e0eb
@@ -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
@@ -78,7 +78,7 @@ class CBaseStar {
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() {}
@@ -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;
}
}

0 comments on commit 0e0500f

Please sign in to comment.
You can’t perform that action at this time.