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

[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:
ca0a6d3d7e TITANIC: Some fixes for marker 1 rotation code


Commit: ca0a6d3d7ea2dc4c53ce550282defc01acdad954
    https://github.com/scummvm/scummvm/commit/ca0a6d3d7ea2dc4c53ce550282defc01acdad954
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-04T14:22:02-04:00

Commit Message:
TITANIC: Some fixes for marker 1 rotation code

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


diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index 628bfcd..f344276 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -260,21 +260,20 @@ void CStarCamera::setViewportAngle(const FPoint &angles) {
 		tempV5 -= row1;
 		tempV6 -= row1;
 
-		tempV1 = tempV7 = tempV1.fn5(pose);
-		tempV4 = tempV1 = tempV4.fn5(pose);
+		tempV1 = tempV1.fn5(pose);
+		tempV4 = tempV4.fn5(pose);
 		tempV5 = tempV5.fn5(pose);
 		tempV6 = tempV6.fn5(pose);
 
-		tempV4 = tempV4 - tempV1;
-		FVector tempV9 = tempV5 - tempV1;
-		FVector tempV10 = tempV6 - tempV1;
-
+		tempV4 -= tempV1;
+		tempV5 -= tempV1;
+		tempV6 -= tempV1;
 		tempV4.normalize();
-		tempV9.normalize();
-		tempV10.normalize();
+		tempV5.normalize();
+		tempV6.normalize();
 
 		tempV1 += row1;
-		m1.set(tempV4, tempV9, tempV10);
+		m1.set(tempV4, tempV5, tempV6);
 		_viewport.setOrientation(m1);
 		_viewport.setPosition(tempV1);
 	} else if (_matrixRow == 1) {