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

K_DoPogoSpring: Don't set Trick state if Player is in pain

Browse source
This commit is contained in:
toaster 2023-11-06 14:55:28 +00:00
parent e06d961574
commit 2ecfe2f50f
1 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/k_kart.c
View file

@ -6338,51 +6338,54 @@ void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound)
if (mo->player)
{
mo->player->trickpanel = 1;
mo->player->pflags |= PF_TRICKDELAY;
if (P_MobjWasRemoved(mo->player->trickIndicator) == false)
if (!P_PlayerInPain(mo->player))
{
mobj_t *trickIndicator = mo->player->trickIndicator;
mo->player->trickpanel = 1;
mo->player->pflags |= PF_TRICKDELAY;
P_SetScale(trickIndicator,
trickIndicator->destscale
= trickIndicator->old_scale
= trickIndicator->old_scale2
= mo->scale/4);
trickIndicator->rollangle = 0;
static const skincolornum_t trick_colors[] = {
SKINCOLOR_GREY, // trickPanel == 1
SKINCOLOR_TAN,
SKINCOLOR_YELLOW, // trickPanel == 2
SKINCOLOR_TANGERINE,
SKINCOLOR_KETCHUP, // trickPanel == 3
SKINCOLOR_MOONSET,
SKINCOLOR_ULTRAMARINE, // trickPanel == 4
};
static const UINT8 numColors = sizeof(trick_colors) / sizeof(skincolornum_t);
const fixed_t step = 8*FRACUNIT;
fixed_t trickcol = ((vertispeed - (step/2)) / step) - 1;
if (trickcol < 0)
trickcol = 0;
trickIndicator->color = trick_colors[min(trickcol, numColors - 1)];
P_SetMobjState(trickIndicator, S_TRICKINDICATOR_UNDERLAY);
if (P_MobjWasRemoved(trickIndicator->tracer) == false)
if (P_MobjWasRemoved(mo->player->trickIndicator) == false)
{
P_SetScale(trickIndicator->tracer,
trickIndicator->tracer->destscale
= trickIndicator->tracer->old_scale
= trickIndicator->tracer->old_scale2
= trickIndicator->destscale);
trickIndicator->tracer->rollangle = 0;
mobj_t *trickIndicator = mo->player->trickIndicator;
trickIndicator->tracer->color = mo->player->trickIndicator->color;
P_SetScale(trickIndicator,
trickIndicator->destscale
= trickIndicator->old_scale
= trickIndicator->old_scale2
= mo->scale/4);
trickIndicator->rollangle = 0;
P_SetMobjState(trickIndicator->tracer, S_TRICKINDICATOR_OVERLAY);
static const skincolornum_t trick_colors[] = {
SKINCOLOR_GREY, // trickPanel == 1
SKINCOLOR_TAN,
SKINCOLOR_YELLOW, // trickPanel == 2
SKINCOLOR_TANGERINE,
SKINCOLOR_KETCHUP, // trickPanel == 3
SKINCOLOR_MOONSET,
SKINCOLOR_ULTRAMARINE, // trickPanel == 4
};
static const UINT8 numColors = sizeof(trick_colors) / sizeof(skincolornum_t);
const fixed_t step = 8*FRACUNIT;
fixed_t trickcol = ((vertispeed - (step/2)) / step) - 1;
if (trickcol < 0)
trickcol = 0;
trickIndicator->color = trick_colors[min(trickcol, numColors - 1)];
P_SetMobjState(trickIndicator, S_TRICKINDICATOR_UNDERLAY);
if (P_MobjWasRemoved(trickIndicator->tracer) == false)
{
P_SetScale(trickIndicator->tracer,
trickIndicator->tracer->destscale
= trickIndicator->tracer->old_scale
= trickIndicator->tracer->old_scale2
= trickIndicator->destscale);
trickIndicator->tracer->rollangle = 0;
trickIndicator->tracer->color = mo->player->trickIndicator->color;
P_SetMobjState(trickIndicator->tracer, S_TRICKINDICATOR_OVERLAY);
}
}
}