stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-16 17:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix scale issues with karma hitbox if recently used Grow

Browse source
This commit is contained in:
TehRealSalt 2018-06-30 23:49:37 -04:00
parent 72ed94bfcf
commit 2f8801902f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_mobj.c
View file

@ -8121,6 +8121,9 @@ void P_MobjThinker(mobj_t *mobj)
} }
P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->target->z); P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
mobj->scalespeed = mobj->target->scalespeed;
mobj->destscale = mobj->target->destscale;
P_SetScale(mobj, mobj->target->scale);
mobj->color = mobj->target->color; mobj->color = mobj->target->color;
mobj->colorized = (mobj->target->player->kartstuff[k_comebackmode] == 1); mobj->colorized = (mobj->target->player->kartstuff[k_comebackmode] == 1);
@ -8151,7 +8154,7 @@ void P_MobjThinker(mobj_t *mobj)
// Now for the wheels // Now for the wheels
{ {
const fixed_t rad = mobjinfo[MT_PLAYER].radius; const fixed_t rad = (mobjinfo[MT_PLAYER].radius * mobj->target->scale);
mobj_t *cur = mobj->hnext; mobj_t *cur = mobj->hnext;
while (cur && !P_MobjWasRemoved(cur)) while (cur && !P_MobjWasRemoved(cur))
@ -8165,6 +8168,9 @@ void P_MobjThinker(mobj_t *mobj)
offy *= -1; offy *= -1;
P_TeleportMove(cur, mobj->x + offx, mobj->y + offy, mobj->z); P_TeleportMove(cur, mobj->x + offx, mobj->y + offy, mobj->z);
cur->scalespeed = mobj->target->scalespeed;
cur->destscale = mobj->target->destscale;
P_SetScale(cur, mobj->target->scale);
if (mobj->flags2 & MF2_DONTDRAW) if (mobj->flags2 & MF2_DONTDRAW)
cur->flags2 |= MF2_DONTDRAW; cur->flags2 |= MF2_DONTDRAW;