[Scummvm-git-logs] scummvm master -> 4591dd966a13a4c7eaced7a7413945ad45545de8

dreammaster dreammaster at scummvm.org
Wed Mar 22 03:11:40 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:
4591dd966a TITANIC: Finished CStarControlSub22 class


Commit: 4591dd966a13a4c7eaced7a7413945ad45545de8
    https://github.com/scummvm/scummvm/commit/4591dd966a13a4c7eaced7a7413945ad45545de8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-21T22:11:32-04:00

Commit Message:
TITANIC: Finished CStarControlSub22 class

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


diff --git a/engines/titanic/star_control/star_control_sub21.cpp b/engines/titanic/star_control/star_control_sub21.cpp
index 681736d..c81d591 100644
--- a/engines/titanic/star_control/star_control_sub21.cpp
+++ b/engines/titanic/star_control/star_control_sub21.cpp
@@ -55,6 +55,7 @@ void CStarControlSub21::proc10(const FVector &v1, const FVector &v2, const FVect
 
 void CStarControlSub21::proc11(CErrorCode &errorCode, FVector &v, const FMatrix &m) {
 	if (_sub24.get8()) {
+		decLockCount();
 		int val = _sub24.proc5(errorCode, v, m);
 		if (val == 1)
 			incLockCount();
diff --git a/engines/titanic/star_control/star_control_sub22.cpp b/engines/titanic/star_control/star_control_sub22.cpp
index b76d96e..b5962bc 100644
--- a/engines/titanic/star_control/star_control_sub22.cpp
+++ b/engines/titanic/star_control/star_control_sub22.cpp
@@ -38,7 +38,22 @@ void CStarControlSub22::proc8(FVector &v1, FVector &v2, FMatrix &m1, FMatrix &m2
 }
 
 void CStarControlSub22::proc11(CErrorCode &errorCode, FVector &v, const FMatrix &m) {
-	// TODO
+	if (_sub27.get8()) {
+		decLockCount();
+		int val = _sub27.proc5(errorCode, v, m);
+		if (val == 1)
+			incLockCount();
+		if (val == 2) {
+			proc7();
+			if (_starVector)
+				_starVector->apply();
+		}
+	} else if (_size != 0.0) {
+		v._x += m._row3._x * _size;
+		v._y += m._row3._y * _size;
+		v._z += m._row3._z * _size;
+		errorCode.set();
+	}
 }
 
 } // End of namespace Titanic





More information about the Scummvm-git-logs mailing list