[Scummvm-git-logs] scummvm master -> 5f71b73a3211f5a7f152a2e978380e20598ade98

dreammaster dreammaster at scummvm.org
Fri Mar 24 02:13:24 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:
5f71b73a32 TITANIC: Finished FVector class


Commit: 5f71b73a3211f5a7f152a2e978380e20598ade98
    https://github.com/scummvm/scummvm/commit/5f71b73a3211f5a7f152a2e978380e20598ade98
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-23T21:13:16-04:00

Commit Message:
TITANIC: Finished FVector class

Changed paths:
    engines/titanic/star_control/fvector.cpp


diff --git a/engines/titanic/star_control/fvector.cpp b/engines/titanic/star_control/fvector.cpp
index 666b22e..da7f37c 100644
--- a/engines/titanic/star_control/fvector.cpp
+++ b/engines/titanic/star_control/fvector.cpp
@@ -71,7 +71,11 @@ double FVector::getDistance(const FVector &src) const {
 }
 
 FVector FVector::fn5(const CStarControlSub6 *sub6) const {
-	error("TODO: FVector::fn5");
+	FVector v;
+	v._x = sub6->_row2._x * _y + sub6->_row3._x * _z + sub6->_row1._x * _x + sub6->_vector._x;
+	v._y = sub6->_row2._y * _y + sub6->_row3._y * _z + sub6->_row1._y * _x + sub6->_vector._y;
+	v._z = sub6->_row3._z * _z + sub6->_row2._z * _y + sub6->_row1._z * _x + sub6->_vector._z;
+	return v;
 }
 
 } // End of namespace Titanic





More information about the Scummvm-git-logs mailing list