[Scummvm-git-logs] scummvm master -> 80c22322cb16ed701433914b68f05f421fe08ac7
dreammaster
dreammaster at scummvm.org
Tue Mar 21 02:06:33 CET 2017
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:
80c22322cb TITANIC: Fix compiler warning
Commit: 80c22322cb16ed701433914b68f05f421fe08ac7
https://github.com/scummvm/scummvm/commit/80c22322cb16ed701433914b68f05f421fe08ac7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-20T21:06:20-04:00
Commit Message:
TITANIC: Fix compiler warning
Changed paths:
engines/titanic/star_control/base_star.cpp
engines/titanic/star_control/base_star.h
engines/titanic/star_control/star_control_sub12.cpp
diff --git a/engines/titanic/star_control/base_star.cpp b/engines/titanic/star_control/base_star.cpp
index 92e3495..b1e813b 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 7dd3fb5..ff09652 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 190e9e4..653c156 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
}
More information about the Scummvm-git-logs
mailing list