From 5ed1dc5410158fc3086797d7dada645c7c1de4e5 Mon Sep 17 00:00:00 2001
From: lachwright <lachlanwright17@gmail.com>
Date: Sun, 29 Dec 2019 03:01:09 +0800
Subject: [PATCH] Remove MF_NOTHINK from join-breaking referenced objects
---
src/info.c | 8 ++++----
src/p_enemy.c | 2 +-
src/p_mobj.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/info.c b/src/info.c
index dd808349e..30f3e96d0 100644
--- a/src/info.c
+++ b/src/info.c
@@ -4492,7 +4492,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY, // flags
+ MF_SCENERY|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY, // flags
S_NULL // raisestate
},
@@ -6273,7 +6273,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // mass
0, // damage
sfx_None, // activesound
- MF_NOGRAVITY|MF_NOBLOCKMAP|MF_NOTHINK, // flags
+ MF_NOGRAVITY|MF_NOBLOCKMAP|MF_SCENERY, // flags
S_NULL // raisestate
},
@@ -11992,7 +11992,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags
+ MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags
S_NULL // raisestate
},
@@ -12019,7 +12019,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags
+ MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags
S_NULL // raisestate
},
diff --git a/src/p_enemy.c b/src/p_enemy.c
index f15ad86ae..31c1f76c7 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -2261,7 +2261,7 @@ void A_CrushclawLaunch(mobj_t *actor)
while (chain)
{
P_TeleportMove(chain, actor->target->x + idx, actor->target->y + idy, actor->target->z + idz);
- chain->watertop = chain->z;
+ chain->movefactor = chain->z;
idx += dx;
idy += dy;
idz += dz;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 75bc174a5..8880e5827 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -9434,7 +9434,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
SINT8 sign = ((mobj->tics & 1) ? mobj->tics : -(SINT8)(mobj->tics));
while (chain)
{
- chain->z = chain->watertop + sign*mobj->scale;
+ chain->z = chain->movefactor + sign*mobj->scale;
sign = -sign;
chain = chain->target;
}
--
GitLab