From a6a3048c8f9ae1c8dd914754789f12713f84c1af Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Mon, 29 Jul 2019 21:03:28 +0100
Subject: [PATCH] * Fix diagonal spring ring assortments being forced up/down
with slopes.
---
src/p_mobj.c | 78 +++++++++++++++++++++++++++++-----------------------
1 file changed, 44 insertions(+), 34 deletions(-)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 1cb7f742d4..7c50967cb4 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12355,28 +12355,33 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
if (nightsreplace)
ringthing = MT_NIGHTSSTAR;
- for (r = 1; r <= 5; r++)
+ if (mthing->options & MTF_OBJECTFLIP)
{
- if (mthing->options & MTF_OBJECTFLIP)
- {
- z = (
+ z = (
#ifdef ESLOPE
- sec->c_slope ? P_GetZAt(sec->c_slope, x, y) :
+ sec->c_slope ? P_GetZAt(sec->c_slope, x, y) :
#endif
- sec->ceilingheight) - mobjinfo[ringthing].height - dist*r;
- if (mthing->options >> ZSHIFT)
- z -= ((mthing->options >> ZSHIFT) << FRACBITS);
+ sec->ceilingheight) - mobjinfo[ringthing].height;
+ if (mthing->options >> ZSHIFT)
+ z -= ((mthing->options >> ZSHIFT) << FRACBITS);
}
- else
- {
- z = (
+ else
+ {
+ z = (
#ifdef ESLOPE
- sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
+ sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
#endif
- sec->floorheight) + dist*r;
- if (mthing->options >> ZSHIFT)
- z += ((mthing->options >> ZSHIFT) << FRACBITS);
- }
+ sec->floorheight);
+ if (mthing->options >> ZSHIFT)
+ z += ((mthing->options >> ZSHIFT) << FRACBITS);
+ }
+
+ for (r = 1; r <= 5; r++)
+ {
+ if (mthing->options & MTF_OBJECTFLIP)
+ z -= dist;
+ else
+ z += dist;
mobj = P_SpawnMobj(x, y, z, ringthing);
@@ -12410,31 +12415,36 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
closestangle = FixedAngle(mthing->angle*FRACUNIT);
fa = (closestangle >> ANGLETOFINESHIFT);
+ if (mthing->options & MTF_OBJECTFLIP)
+ {
+ z = (
+#ifdef ESLOPE
+ sec->c_slope ? P_GetZAt(sec->c_slope, x, y) :
+#endif
+ sec->ceilingheight) - mobjinfo[ringthing].height;
+ if (mthing->options >> ZSHIFT)
+ z -= ((mthing->options >> ZSHIFT) << FRACBITS);
+ }
+ else
+ {
+ z = (
+#ifdef ESLOPE
+ sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
+#endif
+ sec->floorheight);
+ if (mthing->options >> ZSHIFT)
+ z += ((mthing->options >> ZSHIFT) << FRACBITS);
+ }
+
for (r = 1; r <= iterations; r++)
{
x += FixedMul(64*FRACUNIT, FINECOSINE(fa));
y += FixedMul(64*FRACUNIT, FINESINE(fa));
if (mthing->options & MTF_OBJECTFLIP)
- {
- z = (
-#ifdef ESLOPE
- sec->c_slope ? P_GetZAt(sec->c_slope, x, y) :
-#endif
- sec->ceilingheight) - mobjinfo[ringthing].height - 64*FRACUNIT*r;
- if (mthing->options >> ZSHIFT)
- z -= ((mthing->options >> ZSHIFT) << FRACBITS);
- }
+ z -= 64*FRACUNIT;
else
- {
- z = (
-#ifdef ESLOPE
- sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
-#endif
- sec->floorheight) + 64*FRACUNIT*r;
- if (mthing->options >> ZSHIFT)
- z += ((mthing->options >> ZSHIFT) << FRACBITS);
- }
+ z += 64*FRACUNIT;
mobj = P_SpawnMobj(x, y, z, ringthing);
--
GitLab