diff options
| author | Paul Gilbert | 2017-04-04 21:44:19 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-04-04 21:44:19 -0400 |
| commit | 4378dd37b7562592c6e5d4e699b6a88dc56ae406 (patch) | |
| tree | 8aed7d48bee7ca12b26f81450d61f75e996100ba /engines | |
| parent | 903cffca281c3ba44bd9d79d34dfc4eadf1a42b3 (diff) | |
| download | scummvm-rg350-4378dd37b7562592c6e5d4e699b6a88dc56ae406.tar.gz scummvm-rg350-4378dd37b7562592c6e5d4e699b6a88dc56ae406.tar.bz2 scummvm-rg350-4378dd37b7562592c6e5d4e699b6a88dc56ae406.zip | |
TITANIC: Correct usage of x/y angle in setViewportPosition
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/star_control/star_control_sub12.cpp | 10 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_view.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/titanic/star_control/star_control_sub12.cpp b/engines/titanic/star_control/star_control_sub12.cpp index 21546ede23..74afebe4ab 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 2f98ecc5e6..d3693d5042 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; } } |