From e2f688ca2d891b4e81d588da714522d58c926048 Mon Sep 17 00:00:00 2001
From: chromaticpipe <chromaticpipe@gmail.com>
Date: Wed, 26 Mar 2025 12:42:39 -0500
Subject: [PATCH] Revert "Disable sprite/model rotation on slopes for now"
This reverts commit bc9e7c146126bdd65f79c8fb5f37930d41b2816e.
---
src/hardware/hw_md2.c | 5 -----
src/p_mobj.c | 5 -----
src/r_patchrotation.c | 4 ----
3 files changed, 14 deletions(-)
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 397dcdfba..8c48cfab6 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1692,13 +1692,8 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
}
}
-#if 0
p.anglez = FIXED_TO_FLOAT(AngleFixed(interp.pitch));
p.anglex = FIXED_TO_FLOAT(AngleFixed(interp.roll));
-#else
- p.anglez = 0.f;
- p.anglex = 0.f;
-#endif
p.flip = atransform.flip;
p.mirror = atransform.mirror;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index fd5d6f892..d248c517e 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1442,7 +1442,6 @@ void P_CheckGravity(mobj_t *mo, boolean affect)
//
void P_SetPitchRollFromSlope(mobj_t *mo, pslope_t *slope)
{
-#if 0
if (slope)
{
fixed_t tempz = slope->normal.z;
@@ -1456,10 +1455,6 @@ void P_SetPitchRollFromSlope(mobj_t *mo, pslope_t *slope)
{
mo->pitch = mo->roll = 0;
}
-#else
- (void)mo;
- (void)slope;
-#endif
}
#define STOPSPEED (FRACUNIT)
diff --git a/src/r_patchrotation.c b/src/r_patchrotation.c
index 989665d74..6fb878336 100644
--- a/src/r_patchrotation.c
+++ b/src/r_patchrotation.c
@@ -26,7 +26,6 @@ angle_t R_ModelRotationAngle(interpmobjstate_t *interp)
angle_t R_SpriteRotationAngle(interpmobjstate_t *interp)
{
-#if 0
angle_t viewingAngle = R_PointToAngle(interp->x, interp->y);
fixed_t pitchMul = -FINESINE(viewingAngle >> ANGLETOFINESHIFT);
@@ -35,9 +34,6 @@ angle_t R_SpriteRotationAngle(interpmobjstate_t *interp)
angle_t rollOrPitch = FixedMul(interp->pitch, pitchMul) + FixedMul(interp->roll, rollMul);
return (rollOrPitch + R_ModelRotationAngle(interp));
-#else
- return R_ModelRotationAngle(interp);
-#endif
}
INT32 R_GetRollAngle(angle_t rollangle)
--
GitLab