From 1eeaee1ac78900acfaed243b264b3431789b45e3 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Thu, 7 Apr 2016 13:05:29 +0200
Subject: [PATCH] - completely reviewed and fixed all codes using angles in the
automap.
---
src/am_map.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/am_map.cpp b/src/am_map.cpp
index 76f6270fa..765443c20 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -1191,7 +1191,7 @@ void AM_changeWindowLoc ()
oincy = incy = m_paninc.y * SCREENHEIGHT / 200;
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
{
- AM_rotate(&incx, &incy, players[consoleplayer].camera->Angles.Yaw + 90.);
+ AM_rotate(&incx, &incy, players[consoleplayer].camera->Angles.Yaw - 90.);
}
m_x += incx;
@@ -1573,7 +1573,7 @@ void AM_doFollowPlayer ()
sy = (f_oldloc.y - players[consoleplayer].camera->Y());
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
{
- AM_rotate (&sx, &sy, players[consoleplayer].camera->Angles.Yaw + 90);
+ AM_rotate (&sx, &sy, players[consoleplayer].camera->Angles.Yaw - 90);
}
AM_ScrollParchment (sx, sy);
@@ -2713,7 +2713,7 @@ void AM_drawPlayers ()
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
{
AM_rotatePoint (&pt.x, &pt.y);
- angle -= players[consoleplayer].camera->Angles.Yaw + 90.;
+ angle -= players[consoleplayer].camera->Angles.Yaw - 90.;
}
AM_drawLineCharacter(&MapArrow[0], MapArrow.Size(), 0, angle, color, pt.x, pt.y);
@@ -2802,11 +2802,11 @@ void AM_drawThings ()
const size_t spriteIndex = sprite.spriteframes + (show > 1 ? t->frame : 0);
frame = &SpriteFrames[spriteIndex];
- DAngle angle = -t->Angles.Yaw + 90.;
+ DAngle angle = 270. -t->Angles.Yaw;
if (frame->Texture[0] != frame->Texture[1]) angle += 180. / 16;
if (am_rotate == 1 || (am_rotate == 2 && viewactive))
{
- angle += players[consoleplayer].camera->Angles.Yaw + 90.;
+ angle += players[consoleplayer].camera->Angles.Yaw - 90.;
}
rotation = int((angle.Normalized360() * (16. / 360.)).Degrees);