thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'grow-adjustments' into 'master'

Browse source 
Minor Grow scale corrections

See merge request KartKrew/Kart!605
This commit is contained in:
James R 2022-05-25 08:05:40 +00:00
commit 0bcabbb88a
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_kart.c
View file

@ -5609,7 +5609,6 @@ static void K_DoShrink(player_t *user)
void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound) void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound)
{ {
const fixed_t vscale = mapobjectscale + (mo->scale - mapobjectscale);
fixed_t thrust = 0; fixed_t thrust = 0;
if (mo->player && mo->player->spectator) if (mo->player && mo->player->spectator)
@ -5650,7 +5649,7 @@ void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound)
//CONS_Printf("Got boost: %d%\n", mo->player->trickboostpower*100 / FRACUNIT); //CONS_Printf("Got boost: %d%\n", mo->player->trickboostpower*100 / FRACUNIT);
} }
mo->momz = FixedMul(thrust, vscale); mo->momz = FixedMul(thrust, mapobjectscale);
if (mo->eflags & MFE_UNDERWATER) if (mo->eflags & MFE_UNDERWATER)
{ {

2
src/p_enemy.c
View file

@ -4018,7 +4018,7 @@ void A_AttractChase(mobj_t *actor)
{ {
fixed_t dist = (4*actor->target->scale) * (16 - actor->extravalue1); fixed_t dist = (4*actor->target->scale) * (16 - actor->extravalue1);
P_SetScale(actor, (actor->destscale = actor->target->scale - ((actor->target->scale/14) * actor->extravalue1))); P_SetScale(actor, (actor->destscale = mapobjectscale - ((mapobjectscale/14) * actor->extravalue1)));
actor->z = actor->target->z; actor->z = actor->target->z;
K_MatchGenericExtraFlags(actor, actor->target); K_MatchGenericExtraFlags(actor, actor->target);
P_MoveOrigin(actor, P_MoveOrigin(actor,