diff --git a/src/p_mobj.c b/src/p_mobj.c index 5926a6be7..5862c7b03 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7729,11 +7729,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj) newScale = FixedMul(newScale, FixedDiv(newHeight / 2, mobj->target->height)); } - if (mobj->target->player->curshield == KSHIELD_FLAME) - { - newScale = 8 * newScale / 5; - } - mobj->angle = K_MomentumAngle(mobj->target); P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + (newHeight / 2)); mobj->destscale = newScale; @@ -8386,7 +8381,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) P_RemoveMobj(mobj); return false; } - P_SetScale(mobj, (mobj->destscale = (7*mobj->target->scale)>>2)); + P_SetScale(mobj, (mobj->destscale = (5*mobj->target->scale)>>2)); P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + mobj->target->height/2); break; @@ -8515,7 +8510,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) flamemax = mobj->target->player->flamelength; - P_SetScale(mobj, (mobj->destscale = (8*mobj->target->scale)>>2)); + P_SetScale(mobj, (mobj->destscale = (5*mobj->target->scale)>>2)); curstate = ((mobj->tics == 1) ? (mobj->state->nextstate) : ((statenum_t)(mobj->state-states)));