From a6f959ba21c9f599b4823d0adce9bc9d7c355b65 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Mon, 10 Sep 2018 00:35:40 -0400
Subject: [PATCH] Set mobj->floorrover and ceilingrover in appropriate places
---
src/lua_mobjlib.c | 6 ++++++
src/p_local.h | 1 +
src/p_map.c | 10 ++++++++++
src/p_mobj.c | 4 ++++
src/p_polyobj.c | 2 ++
5 files changed, 23 insertions(+)
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index 1583bd3c4d..6efbeff8ec 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -396,6 +396,8 @@ static int mobj_set(lua_State *L)
P_CheckPosition(mo, mo->x, mo->y);
mo->floorz = tmfloorz;
mo->ceilingz = tmceilingz;
+ mo->floorrover = tmfloorrover;
+ mo->ceilingrover = tmceilingrover;
P_SetTarget(&tmthing, ptmthing);
break;
}
@@ -439,6 +441,8 @@ static int mobj_set(lua_State *L)
P_CheckPosition(mo, mo->x, mo->y);
mo->floorz = tmfloorz;
mo->ceilingz = tmceilingz;
+ mo->floorrover = tmfloorrover;
+ mo->ceilingrover = tmceilingrover;
P_SetTarget(&tmthing, ptmthing);
break;
}
@@ -451,6 +455,8 @@ static int mobj_set(lua_State *L)
P_CheckPosition(mo, mo->x, mo->y);
mo->floorz = tmfloorz;
mo->ceilingz = tmceilingz;
+ mo->floorrover = tmfloorrover;
+ mo->ceilingrover = tmceilingrover;
P_SetTarget(&tmthing, ptmthing);
break;
}
diff --git a/src/p_local.h b/src/p_local.h
index 2676fb030a..b98eeae1c6 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -326,6 +326,7 @@ void P_InternalFlickyHop(mobj_t *actor, fixed_t momz, fixed_t momh, angle_t angl
extern boolean floatok;
extern fixed_t tmfloorz;
extern fixed_t tmceilingz;
+extern ffloor_t *tmfloorrover, *tmceilingrover;
extern mobj_t *tmfloorthing, *tmhitthing, *tmthing;
extern camera_t *mapcampointer;
extern fixed_t tmx;
diff --git a/src/p_map.c b/src/p_map.c
index 0726084d55..648bb2bccc 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -102,6 +102,8 @@ boolean P_TeleportMove(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z)
thing->floorz = tmfloorz;
thing->ceilingz = tmceilingz;
+ thing->floorrover = tmfloorrover;
+ thing->ceilingrover = tmceilingrover;
return true;
}
@@ -2485,6 +2487,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
if (thingtop == thing->ceilingz && tmceilingz > thingtop && tmceilingz - thingtop <= maxstep)
{
thing->z = (thing->ceilingz = thingtop = tmceilingz) - thing->height;
+ thing->ceilingrover = tmceilingrover;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
#ifdef ESLOPE
@@ -2492,6 +2495,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
else if (tmceilingslope && tmceilingz < thingtop && thingtop - tmceilingz <= maxstep)
{
thing->z = (thing->ceilingz = thingtop = tmceilingz) - thing->height;
+ thing->ceilingrover = tmceilingrover;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
#endif
@@ -2499,6 +2503,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep)
{
thing->z = thing->floorz = tmfloorz;
+ thing->floorrover = tmfloorrover;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
#ifdef ESLOPE
@@ -2506,6 +2511,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
else if (tmfloorslope && tmfloorz > thing->z && tmfloorz - thing->z <= maxstep)
{
thing->z = thing->floorz = tmfloorz;
+ thing->floorrover = tmfloorrover;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
#endif
@@ -2577,6 +2583,8 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
thing->floorz = tmfloorz;
thing->ceilingz = tmceilingz;
+ thing->floorrover = tmfloorrover;
+ thing->ceilingrover = tmceilingrover;
#ifdef ESLOPE
if (!(thing->flags & MF_NOCLIPHEIGHT))
@@ -2657,6 +2665,8 @@ boolean P_SceneryTryMove(mobj_t *thing, fixed_t x, fixed_t y)
thing->floorz = tmfloorz;
thing->ceilingz = tmceilingz;
+ thing->floorrover = tmfloorrover;
+ thing->ceilingrover = tmceilingrover;
thing->x = x;
thing->y = y;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index d433561ae6..7c9baf0f11 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8027,6 +8027,8 @@ void P_MobjThinker(mobj_t *mobj)
return;
mobj->floorz = tmfloorz;
mobj->ceilingz = tmceilingz;
+ mobj->floorrover = tmfloorrover;
+ mobj->ceilingrover = tmceilingrover;
if ((mobj->eflags & MFE_UNDERWATER) && mobj->health > 0)
{
@@ -8545,6 +8547,8 @@ void P_SceneryThinker(mobj_t *mobj)
return;
mobj->floorz = tmfloorz;
mobj->ceilingz = tmceilingz;
+ mobj->floorrover = tmfloorrover;
+ mobj->ceilingrover = tmceilingrover;
}
else
{
diff --git a/src/p_polyobj.c b/src/p_polyobj.c
index fd3237c9da..23e799d061 100644
--- a/src/p_polyobj.c
+++ b/src/p_polyobj.c
@@ -985,6 +985,8 @@ static void Polyobj_pushThing(polyobj_t *po, line_t *line, mobj_t *mo)
P_CheckPosition(mo, mo->x + momx, mo->y + momy);
mo->floorz = tmfloorz;
mo->ceilingz = tmceilingz;
+ mo->floorrover = tmfloorrover;
+ mo->ceilingrover = tmceilingrover;
}
}
--
GitLab