[Scummvm-git-logs] scummvm master -> c0030abe5ef238fe4bb1b60839bbba65a0671623

[dreammaster]

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:
c0030abe5e TITANIC: Finished CStarControlSub21 class


Commit: c0030abe5ef238fe4bb1b60839bbba65a0671623
    https://github.com/scummvm/scummvm/commit/c0030abe5ef238fe4bb1b60839bbba65a0671623
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-21T22:07:38-04:00

Commit Message:
TITANIC: Finished CStarControlSub21 class

Changed paths:
    engines/titanic/star_control/star_control_sub13.cpp
    engines/titanic/star_control/star_control_sub21.cpp


diff --git a/engines/titanic/star_control/star_control_sub13.cpp b/engines/titanic/star_control/star_control_sub13.cpp
index 6512d12..190ae20 100644
--- a/engines/titanic/star_control/star_control_sub13.cpp
+++ b/engines/titanic/star_control/star_control_sub13.cpp
@@ -68,6 +68,7 @@ void CStarControlSub13::copyFrom(const CStarControlSub13 *src) {
 		_position = src->_position;
 		_fieldC = src->_field18;
 		_field10 = src->_field1C;
+		error("TODO: Remainder of CStarControlSub13::copyFrom");
 	}
 }
 
diff --git a/engines/titanic/star_control/star_control_sub21.cpp b/engines/titanic/star_control/star_control_sub21.cpp
index 1e676b7..681736d 100644
--- a/engines/titanic/star_control/star_control_sub21.cpp
+++ b/engines/titanic/star_control/star_control_sub21.cpp
@@ -60,11 +60,14 @@ void CStarControlSub21::proc11(CErrorCode &errorCode, FVector &v, const FMatrix
 			incLockCount();
 		if (val == 2) {
 			proc7();
-			error("TODO: _dataP");
+			if (_starVector)
+				_starVector->apply();
 		}
 	} else if (_size != 0.0) {
-		// TODO
-		error("TODO");
+		v._x += m._row3._x * _size;
+		v._y += m._row3._y * _size;
+		v._z += m._row3._z * _size;
+		errorCode.set();
 	}
 }