From c5bd4d6ecd41f79047cfaccdaffb2e0536492cda Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 5 Jul 2019 20:11:38 -0700 Subject: [PATCH] Apply P_MobjFlip to ring and ring sparkle animations --- src/p_enemy.c | 4 ++-- src/p_mobj.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 7baca2adc..047df4f70 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3601,7 +3601,7 @@ void A_AttractChase(mobj_t *actor) { fixed_t offz = FixedMul(80*actor->target->scale, FINESINE(FixedAngle((90 - (9 * abs(10 - actor->extravalue1))) << FRACBITS) >> ANGLETOFINESHIFT)); //P_SetScale(actor, (actor->destscale = actor->target->scale)); - P_TeleportMove(actor, actor->target->x, actor->target->y, actor->target->z + actor->target->height + offz); + P_TeleportMove(actor, actor->target->x, actor->target->y, actor->target->z + ( actor->target->height + offz )* P_MobjFlip(actor)); actor->extravalue1++; } } @@ -3631,7 +3631,7 @@ void A_AttractChase(mobj_t *actor) P_TeleportMove(actor, actor->target->x + FixedMul(dist, FINECOSINE(actor->angle >> ANGLETOFINESHIFT)), actor->target->y + FixedMul(dist, FINESINE(actor->angle >> ANGLETOFINESHIFT)), - actor->target->z + (24 * actor->target->scale)); + actor->target->z + (24 * actor->target->scale) * P_MobjFlip(actor)); actor->angle += ANG30; actor->extravalue1++; diff --git a/src/p_mobj.c b/src/p_mobj.c index 9919b2266..7ac144836 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8349,7 +8349,7 @@ void P_MobjThinker(mobj_t *mobj) K_MatchGenericExtraFlags(mobj, mobj->target); P_TeleportMove(mobj, mobj->target->x + FINECOSINE(mobj->angle >> ANGLETOFINESHIFT), mobj->target->y + FINESINE(mobj->angle >> ANGLETOFINESHIFT), - mobj->target->z + mobj->target->height); + mobj->target->z + mobj->target->height * P_MobjFlip(mobj)); break; case MT_THUNDERSHIELD: {