[Scummvm-git-logs] scummvm master -> 4378dd37b7562592c6e5d4e699b6a88dc56ae406
dreammaster
dreammaster at scummvm.org
Wed Apr 5 03:44:29 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:
4378dd37b7 TITANIC: Correct usage of x/y angle in setViewportPosition
Commit: 4378dd37b7562592c6e5d4e699b6a88dc56ae406
https://github.com/scummvm/scummvm/commit/4378dd37b7562592c6e5d4e699b6a88dc56ae406
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-04-04T21:44:19-04:00
Commit Message:
TITANIC: Correct usage of x/y angle in setViewportPosition
Changed paths:
engines/titanic/star_control/star_control_sub12.cpp
engines/titanic/star_control/star_view.cpp
diff --git a/engines/titanic/star_control/star_control_sub12.cpp b/engines/titanic/star_control/star_control_sub12.cpp
index 21546ed..74afebe 100644
--- a/engines/titanic/star_control/star_control_sub12.cpp
+++ b/engines/titanic/star_control/star_control_sub12.cpp
@@ -225,15 +225,15 @@ void CStarControlSub12::setViewportPosition(const FPoint &angles) {
return;
if (_matrixRow == -1) {
- CStarControlSub6 subX(X_AXIS, angles._x);
- CStarControlSub6 subY(Y_AXIS, angles._y);
+ CStarControlSub6 subX(X_AXIS, angles._y);
+ CStarControlSub6 subY(Y_AXIS, angles._x);
CStarControlSub6 sub(&subX, &subY);
subY.copyFrom(&sub);
proc22(subY);
} else if (_matrixRow == 0) {
FVector row1 = _matrix._row1;
- CStarControlSub6 subX(X_AXIS, angles._x);
- CStarControlSub6 subY(Y_AXIS, angles._y);
+ CStarControlSub6 subX(X_AXIS, angles._y);
+ CStarControlSub6 subY(Y_AXIS, angles._x);
CStarControlSub6 sub(&subX, &subY);
subX.copyFrom(&sub);
@@ -323,7 +323,7 @@ void CStarControlSub12::setViewportPosition(const FPoint &angles) {
DVector tempV13, tempV14, tempV15, tempV16;
DMatrix subX(0, _matrix._row1);
- DMatrix subY(Y_AXIS, angles._x);
+ DMatrix subY(Y_AXIS, angles._y);
tempV1 = _matrix._row2 - _matrix._row1;
diffV = tempV1;
diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index 2f98ecc..d3693d5 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -133,9 +133,9 @@ bool CStarView::MouseMoveMsg(int unused, const Point &pt) {
if (distance >= threshold) {
distance -= threshold;
- FPoint relPt(tempPt._x * -2.0 * distance / threshold,
+ FPoint angle(tempPt._x * -2.0 * distance / threshold,
tempPt._y * -2.0 * distance / threshold);
- _sub12.setViewportPosition(relPt);
+ _sub12.setViewportPosition(angle);
return true;
}
}
More information about the Scummvm-git-logs
mailing list