[Scummvm-git-logs] scummvm master -> 3593f3fe5aea6f23a78d8821a81be64ffdb28ee2
dreammaster
dreammaster at scummvm.org
Tue Mar 21 01:53:07 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:
3593f3fe5a TITANIC: Implemented CStarControlSub12 fn1
Commit: 3593f3fe5aea6f23a78d8821a81be64ffdb28ee2
https://github.com/scummvm/scummvm/commit/3593f3fe5aea6f23a78d8821a81be64ffdb28ee2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-20T20:52:57-04:00
Commit Message:
TITANIC: Implemented CStarControlSub12 fn1
Changed paths:
engines/titanic/star_control/star_control_sub12.cpp
diff --git a/engines/titanic/star_control/star_control_sub12.cpp b/engines/titanic/star_control/star_control_sub12.cpp
index bf5a654..190e9e4 100644
--- a/engines/titanic/star_control/star_control_sub12.cpp
+++ b/engines/titanic/star_control/star_control_sub12.cpp
@@ -401,6 +401,7 @@ bool CStarControlSub12::addMatrixRow(const FVector &v) {
FVector &row = _matrix[++_matrixRow];
row = v;
setupHandler(&data);
+ return true;
}
bool CStarControlSub12::removeMatrixRow() {
@@ -413,6 +414,7 @@ bool CStarControlSub12::removeMatrixRow() {
--_matrixRow;
setupHandler(&data);
+ return true;
}
void CStarControlSub12::proc36(double *v1, double *v2, double *v3, double *v4) {
@@ -463,7 +465,16 @@ void CStarControlSub12::deleteHandler() {
}
void CStarControlSub12::fn1(CStarControlSub13 *sub13, const FVector &v) {
- // TODO
+ if (_matrixRow == 1) {
+ FMatrix m1 = sub13->getMatrix();
+ FMatrix m2 = _sub13.getMatrix();
+ FVector v1 = sub13->_position;
+ FVector v2 = _sub13._position;
+
+ _handlerP->proc8(v2, v1, m2, m1);
+ CStarVector *sv = new CStarVector(this, v);
+ _handlerP->setVector(sv);
+ }
}
void CStarControlSub12::fn2(FVector v1, FVector v2, FVector v3) {
More information about the Scummvm-git-logs
mailing list