From ba908edf55b9f2c79d9f5d87ef123bfbfb0291d8 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 18 Feb 2023 14:02:05 -0800 Subject: [PATCH] Add player sprzoff to Heavy Magician Box --- src/k_kart.c | 3 ++- src/p_mobj.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index c0486b91e..f8c69cc94 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1978,10 +1978,11 @@ void K_SpawnMagicianParticles(mobj_t *mo, int spread) else ang += ANGLE_90; + // sprzoff for Garden Top!! dust = P_SpawnMobjFromMobjUnscaled(mo, FixedMul(mo->radius / 4, FINECOSINE(ang >> ANGLETOFINESHIFT)), FixedMul(mo->radius / 4, FINESINE(ang >> ANGLETOFINESHIFT)), - target->height / 4, (i%3 == 0) ? MT_SIGNSPARKLE : MT_SPINDASHDUST + (target->height / 4) + target->sprzoff, (i%3 == 0) ? MT_SIGNSPARKLE : MT_SPINDASHDUST ); flip = P_MobjFlip(dust); diff --git a/src/p_mobj.c b/src/p_mobj.c index a22fe9036..738ce4f4e 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8091,6 +8091,9 @@ static boolean P_MobjRegularThink(mobj_t *mobj) zoff = mobj->radius*4; } + // Necessary to "ride" on Garden Top + zoff += mobj->target->sprzoff; + if (mobj->flags2 & MF2_AMBUSH) { P_SetOrigin(mobj, destx, desty, mobj->target->z + zoff);