From 7b2e54b426b744db66bcefed5e4ff3d6049d63e3 Mon Sep 17 00:00:00 2001
From: lachwright <lachlanwright17@gmail.com>
Date: Fri, 19 Jun 2020 00:52:24 +0800
Subject: [PATCH] Fix Dragonbomber z positioning
---
src/info.c | 2 +-
src/p_mobj.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/info.c b/src/info.c
index f0272fc79..123269656 100644
--- a/src/info.c
+++ b/src/info.c
@@ -5292,7 +5292,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
100, // mass
0, // damage
sfx_None, // activesound
- MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_BOUNCE|MF_RUNSPAWNFUNC, // flags
+ MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_SLIDEME|MF_RUNSPAWNFUNC, // flags
S_NULL // raisestate
},
diff --git a/src/p_mobj.c b/src/p_mobj.c
index f690ad894..44091d4ef 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -9206,10 +9206,11 @@ static void P_DragonbomberThink(mobj_t *mobj)
mobj->angle += DRAGONTURNSPEED;
else
{
+ boolean flip = mobj->spawnpoint->options & MTF_OBJECTFLIP;
fixed_t vspeed = FixedMul(mobj->info->speed >> 3, mobj->scale);
fixed_t x = mobj->spawnpoint->x << FRACBITS;
fixed_t y = mobj->spawnpoint->y << FRACBITS;
- fixed_t z = mobj->spawnpoint->z << FRACBITS;
+ fixed_t z = (flip ? P_GetSectorCeilingZAt : P_GetSectorFloorZAt)(R_PointInSubsector(x, y)->sector, x, y) + (flip ? -1 : 1)*(mobj->spawnpoint->z << FRACBITS);
angle_t diff = R_PointToAngle2(mobj->x, mobj->y, x, y) - mobj->angle;
if (diff > ANGLE_180)
mobj->angle -= DRAGONTURNSPEED;
--
GitLab