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

dreammaster dreammaster at scummvm.org
Wed Apr 19 03:42:18 CEST 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:
fdf2a70f44 TITANIC: Fixes for CStarControlSub25 fn2


Commit: fdf2a70f447502f6785affad35061e0870bfa970
    https://github.com/scummvm/scummvm/commit/fdf2a70f447502f6785affad35061e0870bfa970
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-04-18T21:42:09-04:00

Commit Message:
TITANIC: Fixes for CStarControlSub25 fn2

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


diff --git a/engines/titanic/star_control/star_control_sub25.cpp b/engines/titanic/star_control/star_control_sub25.cpp
index 0bd5a86..1cec704 100644
--- a/engines/titanic/star_control/star_control_sub25.cpp
+++ b/engines/titanic/star_control/star_control_sub25.cpp
@@ -36,13 +36,13 @@ void CStarControlSub25::fn1(const FMatrix &m1, const FMatrix &m2) {
 }
 
 void CStarControlSub25::fn2(double val, FMatrix &m) {
-	if (val < 0.0) {
+	if (val <= 0.0) {
 		m = _matrix1;
 	} else if (val > 1.0) {
 		m = _matrix2;
 	} else {
 		CStarControlSub26 sub26;
-		sub26.fn5(val, &_sub2, &sub26);
+		_sub1.fn5(val, &_sub2, &sub26);
 
 		DMatrix m1;
 		m1.fn3(&sub26);





More information about the Scummvm-git-logs mailing list