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

[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:
bf3d66d46b TITANIC: Fix result of CMatrixTransform fn5 method


Commit: bf3d66d46b3d01a738f73caf88c070dacca9c3c9
    https://github.com/scummvm/scummvm/commit/bf3d66d46b3d01a738f73caf88c070dacca9c3c9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-05-23T22:14:45-04:00

Commit Message:
TITANIC: Fix result of CMatrixTransform fn5 method

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


diff --git a/engines/titanic/star_control/matrix_transform.cpp b/engines/titanic/star_control/matrix_transform.cpp
index f51b734..9de21e4 100644
--- a/engines/titanic/star_control/matrix_transform.cpp
+++ b/engines/titanic/star_control/matrix_transform.cpp
@@ -134,7 +134,7 @@ CMatrixTransform CMatrixTransform::fn5(double percent, const CMatrixTransform &s
 		double cosVal = acos(val1);
 		double sinVal = sin(cosVal);
 		val2 = sin((1.0 - percent) * cosVal) / sinVal;
-		t2 = src.resize(sin(cosVal * percent) / sinVal);
+		t1 = src.resize(sin(cosVal * percent) / sinVal);
 	}
 
 	t2 = sub1.resize(val2);