From 64c321fbedc5013dd8bc6a8451d9b3b640297fef Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Wed, 28 Oct 2020 21:05:58 -0400
Subject: [PATCH] Fix incorrect tilts

---
 src/hardware/hw_md2.c            | 14 ++------------
 src/hardware/r_opengl/r_opengl.c |  4 ++--
 src/p_mobj.c                     |  4 ++--
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index cbf84e212..e8f28d8f5 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1605,18 +1605,8 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
 				p.rollflip *= -1;
 		}
 
-		p.anglez = 0.0f;
-		p.anglex = 0.0f;
-
-		if (spr->mobj->pitch)
-		{
-			p.anglez = FIXED_TO_FLOAT(-AngleFixed(spr->mobj->pitch));
-		}
-
-		if (spr->mobj->roll)
-		{
-			p.anglex = FIXED_TO_FLOAT(AngleFixed(spr->mobj->roll));
-		}
+		p.anglez = FIXED_TO_FLOAT(AngleFixed(spr->mobj->pitch));
+		p.anglex = FIXED_TO_FLOAT(AngleFixed(spr->mobj->roll));
 
 		// SRB2CBTODO: MD2 scaling support
 		finalscale *= FIXED_TO_FLOAT(spr->mobj->scale);
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index fe07fc808..3e97bc807 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -2643,9 +2643,9 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
 	if (hflipped)
 		scalez = -scalez;
 
-	pglRotatef(pos->anglez, 0.0f, 0.0f, -1.0f); // rotate by slope from Kart
-	pglRotatef(pos->angley, 0.0f, -1.0f, 0.0f);
+	pglRotatef(pos->anglez, 0.0f, 0.0f, -1.0f);
 	pglRotatef(pos->anglex, 1.0f, 0.0f, 0.0f);
+	pglRotatef(pos->angley, 0.0f, -1.0f, 0.0f);
 
 	if (pos->roll)
 	{
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 59f8af921..910f9ee20 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1227,8 +1227,8 @@ void P_SetPitchRollFromSlope(mobj_t *mo, pslope_t *slope)
 		fixed_t tempy = slope->normal.y;
 		fixed_t tempx = slope->normal.x;
 
-		mo->pitch = -R_PointToAngle2(0, 0, FixedSqrt(FixedMul(tempy, tempy) + FixedMul(tempz, tempz)), tempx);
-		mo->roll = -R_PointToAngle2(0, 0, tempz, tempy);
+		mo->pitch = R_PointToAngle2(0, 0, FixedSqrt(FixedMul(tempy, tempy) + FixedMul(tempz, tempz)), tempx);
+		mo->roll = R_PointToAngle2(0, 0, tempz, tempy);
 	}
 	else
 	{