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 'spb-attack-polish' into 'master'

Browse source 
SPB Attack polish

Closes #1202 and #1203

See merge request KartKrew/Kart!2157
This commit is contained in:
Gunla 2024-03-24 17:52:53 +00:00
commit 1a61239d7f
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/k_kart.c
View file

@ -9342,6 +9342,14 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->breathTimer < UINT16_MAX) if (player->breathTimer < UINT16_MAX)
player->breathTimer++; player->breathTimer++;
} }
if (spbplace == -1 && modeattacking & ATTACKING_SPB && !player->mo->hitlag && player->mo->health && !P_PlayerInPain(player) && player->laps > 0 && !player->exiting && !(player->pflags & PF_NOCONTEST))
{
// I'd like this to play a sound to make the situation clearer, but this codepath seems
// to run even when you make standard contact with the SPB. Not sure why. Oh well!
// S_StartSound(NULL, sfx_s26d);
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_INSTAKILL);
}
} }
void K_KartResetPlayerColor(player_t *player) void K_KartResetPlayerColor(player_t *player)
@ -13016,7 +13024,10 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
if (spbplace == -1 || player->position != spbplace) if (spbplace == -1 || player->position != spbplace)
{
player->pflags &= ~PF_RINGLOCK; // reset ring lock player->pflags &= ~PF_RINGLOCK; // reset ring lock
}
if (K_ItemSingularity(player->itemtype) == true) if (K_ItemSingularity(player->itemtype) == true)
{ {

7
src/p_inter.c
View file

@ -2619,6 +2619,13 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
{ {
player->mo->health--; player->mo->health--;
} }
}
if (modeattacking & ATTACKING_SPB)
{
P_DamageMobj(player->mo, NULL, NULL, 1, DMG_INSTAKILL);
return true;
} }
if (player->mo->health <= 0) if (player->mo->health <= 0)