From 1b8531dcf1839390d04c04b6cad57cba4c4d4a02 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Mon, 6 Nov 2023 01:25:10 -0700 Subject: [PATCH 1/3] WIP: Fix shield flip --- src/p_mobj.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 1ada630c8..bb7b03360 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8646,9 +8646,11 @@ static boolean P_MobjRegularThink(mobj_t *mobj) } } - P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + mobj->target->height/2); + P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + (mobj->eflags & MFE_VERTICALFLIP ? 1 : 1) * mobj->target->height/2); mobj->angle = K_MomentumAngle(mobj->target); + K_FlipFromObject(mobj, mobj->target); + if (underlayst != S_NULL) { mobj_t *underlay = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_FLAMESHIELDUNDERLAY); From fa4aaaa7cc8c8c0fa8843b5c8e6ec28e8815ab9b Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Thu, 16 Nov 2023 00:06:27 -0700 Subject: [PATCH 2/3] Zero shield height (they're player-centered now) --- src/info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/info.c b/src/info.c index 71644da80..f2804a593 100644 --- a/src/info.c +++ b/src/info.c @@ -24840,7 +24840,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // deathsound 8, // speed 28*FRACUNIT, // radius - 56*FRACUNIT, // height + 0*FRACUNIT, // height 1, // display offset 16, // mass 0, // damage @@ -24867,7 +24867,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // deathsound 0, // speed 8< Date: Thu, 16 Nov 2023 00:06:39 -0700 Subject: [PATCH 3/3] Lightning shield too --- src/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/info.c b/src/info.c index f2804a593..445de3dc9 100644 --- a/src/info.c +++ b/src/info.c @@ -24786,7 +24786,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // deathsound 8, // speed 28*FRACUNIT, // radius - 56*FRACUNIT, // height + 0*FRACUNIT, // height 1, // display offset 16, // mass 0, // damage