aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
authorPaul Gilbert2017-03-20 21:06:20 -0400
committerPaul Gilbert2017-03-20 21:06:20 -0400
commit80c22322cb16ed701433914b68f05f421fe08ac7 (patch)
tree5b02075f57fd74e086ace814865bcfe7c99738cb /engines/titanic
parent3593f3fe5aea6f23a78d8821a81be64ffdb28ee2 (diff)
downloadscummvm-rg350-80c22322cb16ed701433914b68f05f421fe08ac7.tar.gz
scummvm-rg350-80c22322cb16ed701433914b68f05f421fe08ac7.tar.bz2
scummvm-rg350-80c22322cb16ed701433914b68f05f421fe08ac7.zip
TITANIC: Fix compiler warning
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/star_control/base_star.cpp2
-rw-r--r--engines/titanic/star_control/base_star.h5
-rw-r--r--engines/titanic/star_control/star_control_sub12.cpp3
3 files changed, 8 insertions, 2 deletions
diff --git a/engines/titanic/star_control/base_star.cpp b/engines/titanic/star_control/base_star.cpp
index 92e3495d83..b1e813b0ae 100644
--- a/engines/titanic/star_control/base_star.cpp
+++ b/engines/titanic/star_control/base_star.cpp
@@ -216,7 +216,7 @@ int CBaseStar::baseFn2(CSurfaceArea *surfaceArea, CStarControlSub12 *sub12) {
/*------------------------------------------------------------------------*/
-void CStarVector::proc1() {
+void CStarVector::apply() {
_owner->addMatrixRow(_vector);
}
diff --git a/engines/titanic/star_control/base_star.h b/engines/titanic/star_control/base_star.h
index 7dd3fb5b0e..ff096520e5 100644
--- a/engines/titanic/star_control/base_star.h
+++ b/engines/titanic/star_control/base_star.h
@@ -153,7 +153,10 @@ private:
public:
CStarVector(CStarControlSub12 *owner, const FVector &v) : _owner(owner), _vector(v) {}
- virtual void proc1();
+ /**
+ * Applies the saved vector
+ */
+ void apply();
};
} // End of namespace Titanic
diff --git a/engines/titanic/star_control/star_control_sub12.cpp b/engines/titanic/star_control/star_control_sub12.cpp
index 190e9e4962..653c156ebf 100644
--- a/engines/titanic/star_control/star_control_sub12.cpp
+++ b/engines/titanic/star_control/star_control_sub12.cpp
@@ -501,6 +501,9 @@ void CStarControlSub12::fn2(FVector v1, FVector v2, FVector v3) {
}
void CStarControlSub12::fn3(CStarControlSub13 *sub13, const FVector &v) {
+ if (_matrixRow != 0)
+ return;
+
// TODO
}