From bbefc3b7f4c8d48b3b815c1e099f466ad7073631 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Thu, 8 Aug 2019 23:04:47 +0100
Subject: [PATCH] After looking at the FOF part of P_LineOpening for a while I
now realise many of these variables aren't even necessary, so I removed them
all.
(Naturally I did the same to the camera equivalent)
# Conflicts:
# src/p_maputl.c
---
src/p_maputl.c | 121 ++++++++++++++++---------------------------------
1 file changed, 38 insertions(+), 83 deletions(-)
diff --git a/src/p_maputl.c b/src/p_maputl.c
index a98cc0340..5368c137e 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -418,10 +418,6 @@ void P_CameraLineOpening(line_t *linedef)
if (front->ffloors || back->ffloors)
{
ffloor_t *rover;
- fixed_t highestceiling = highceiling;
- fixed_t lowestceiling = opentop;
- fixed_t highestfloor = openbottom;
- fixed_t lowestfloor = lowfloor;
fixed_t delta1, delta2;
// Check for frontsector's fake floors
@@ -437,15 +433,15 @@ void P_CameraLineOpening(line_t *linedef)
delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2)));
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
- if (bottomheight < lowestceiling && delta1 >= delta2)
- lowestceiling = bottomheight;
- else if (bottomheight < highestceiling && delta1 >= delta2)
- highestceiling = bottomheight;
-
- if (topheight > highestfloor && delta1 < delta2)
- highestfloor = topheight;
- else if (topheight > lowestfloor && delta1 < delta2)
- lowestfloor = topheight;
+ if (bottomheight < opentop && delta1 >= delta2)
+ opentop = bottomheight;
+ else if (bottomheight < highceiling && delta1 >= delta2)
+ highceiling = bottomheight;
+
+ if (topheight > openbottom && delta1 < delta2)
+ openbottom = topheight;
+ else if (topheight > lowfloor && delta1 < delta2)
+ lowfloor = topheight;
}
// Check for backsectors fake floors
@@ -461,28 +457,16 @@ void P_CameraLineOpening(line_t *linedef)
delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2)));
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
- if (bottomheight < lowestceiling && delta1 >= delta2)
- lowestceiling = bottomheight;
- else if (bottomheight < highestceiling && delta1 >= delta2)
- highestceiling = bottomheight;
-
- if (topheight > highestfloor && delta1 < delta2)
- highestfloor = topheight;
- else if (topheight > lowestfloor && delta1 < delta2)
- lowestfloor = topheight;
+ if (bottomheight < opentop && delta1 >= delta2)
+ opentop = bottomheight;
+ else if (bottomheight < highceiling && delta1 >= delta2)
+ highceiling = bottomheight;
+
+ if (topheight > openbottom && delta1 < delta2)
+ openbottom = topheight;
+ else if (topheight > lowfloor && delta1 < delta2)
+ lowfloor = topheight;
}
-
- if (highestceiling < highceiling)
- highceiling = highestceiling;
-
- if (highestfloor > openbottom)
- openbottom = highestfloor;
-
- if (lowestceiling < opentop)
- opentop = lowestceiling;
-
- if (lowestfloor > lowfloor)
- lowfloor = lowestfloor;
}
openrange = opentop - openbottom;
return;
@@ -667,16 +651,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
if (front->ffloors || back->ffloors)
{
ffloor_t *rover;
-
- fixed_t highestceiling = highceiling;
- fixed_t lowestceiling = opentop;
- fixed_t highestfloor = openbottom;
- fixed_t lowestfloor = lowfloor;
fixed_t delta1, delta2;
-#ifdef ESLOPE
- pslope_t *ceilingslope = opentopslope;
- pslope_t *floorslope = openbottomslope;
-#endif
// Check for frontsector's fake floors
for (rover = front->ffloors; rover; rover = rover->next)
@@ -699,26 +674,26 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
{
- if (bottomheight < lowestceiling) {
- lowestceiling = bottomheight;
+ if (bottomheight < opentop) {
+ opentop = bottomheight;
#ifdef ESLOPE
- ceilingslope = *rover->b_slope;
+ opentopslope = *rover->b_slope;
#endif
}
- else if (bottomheight < highestceiling)
- highestceiling = bottomheight;
+ else if (bottomheight < highceiling)
+ highceiling = bottomheight;
}
if (delta1 < delta2 && !(rover->flags & FF_REVERSEPLATFORM)) // thing is above FOF
{
- if (topheight > highestfloor) {
- highestfloor = topheight;
+ if (topheight > openbottom) {
+ openbottom = topheight;
#ifdef ESLOPE
- floorslope = *rover->t_slope;
+ openbottomslope = *rover->t_slope;
#endif
}
- else if (topheight > lowestfloor)
- lowestfloor = topheight;
+ else if (topheight > lowfloor)
+ lowfloor = topheight;
}
}
@@ -743,48 +718,28 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
{
- if (bottomheight < lowestceiling) {
- lowestceiling = bottomheight;
+ if (bottomheight < opentop) {
+ opentop = bottomheight;
#ifdef ESLOPE
- ceilingslope = *rover->b_slope;
+ opentopslope = *rover->b_slope;
#endif
}
- else if (bottomheight < highestceiling)
- highestceiling = bottomheight;
+ else if (bottomheight < highceiling)
+ highceiling = bottomheight;
}
if (delta1 < delta2 && !(rover->flags & FF_REVERSEPLATFORM)) // thing is above FOF
{
- if (topheight > highestfloor) {
- highestfloor = topheight;
+ if (topheight > openbottom) {
+ openbottom = topheight;
#ifdef ESLOPE
- floorslope = *rover->t_slope;
+ openbottomslope = *rover->t_slope;
#endif
}
- else if (topheight > lowestfloor)
- lowestfloor = topheight;
+ else if (topheight > lowfloor)
+ lowfloor = topheight;
}
}
-
- if (highestceiling < highceiling)
- highceiling = highestceiling;
-
- if (highestfloor > openbottom) {
- openbottom = highestfloor;
-#ifdef ESLOPE
- openbottomslope = floorslope;
-#endif
- }
-
- if (lowestceiling < opentop) {
- opentop = lowestceiling;
-#ifdef ESLOPE
- opentopslope = ceilingslope;
-#endif
- }
-
- if (lowestfloor > lowfloor)
- lowfloor = lowestfloor;
}
}
--
GitLab