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

dreammaster dreammaster at scummvm.org
Wed Mar 29 03:48:30 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:
ef66debb7d TITANIC: Fix output of FVector fn1


Commit: ef66debb7d24b4465c59673b81024c40956dd1c3
    https://github.com/scummvm/scummvm/commit/ef66debb7d24b4465c59673b81024c40956dd1c3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-28T21:47:56-04:00

Commit Message:
TITANIC: Fix output of FVector fn1

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


diff --git a/engines/titanic/star_control/fvector.cpp b/engines/titanic/star_control/fvector.cpp
index 456a57f..eec16d1 100644
--- a/engines/titanic/star_control/fvector.cpp
+++ b/engines/titanic/star_control/fvector.cpp
@@ -34,9 +34,9 @@ FVector::FVector(const DVector &src) : _x(src._x), _y(src._y), _z(src._z) {
 FVector FVector::fn1() const {
 	return FVector(
 		(ABS(_x - _y) < 0.00001 && ABS(_y - _z) < 0.00001 &&
-			ABS(_x - _z) < 0.00001) ? -_x : _x,
+			ABS(_x - _z) < 0.00001) ? -_y : _y,
 		_z,
-		_y
+		_x
 	);
 }
 





More information about the Scummvm-git-logs mailing list