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 'no-pain-respawn' into 'master'

Browse source 
Pitblame in Race, stop spinout when lightsnaking

Closes #1360

See merge request kart-krew-dev/ring-racers-internal!2534
This commit is contained in:
Oni VelocitOni 2025-05-18 18:39:30 +00:00
commit c1b10750a3
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_kart.c
View file

@ -9292,6 +9292,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->flashing = K_GetKartFlashing(player); player->flashing = K_GetKartFlashing(player);
} }
if (player->spinouttimer && player->respawn.state != RESPAWNST_NONE)
player->spinouttimer = 0;
if (player->spinouttimer) if (player->spinouttimer)
{ {
if (((P_IsObjectOnGround(player->mo) if (((P_IsObjectOnGround(player->mo)

22
src/p_inter.c
View file

@ -2600,20 +2600,20 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
player->roundconditions.checkthisframe = true; player->roundconditions.checkthisframe = true;
} }
if (gametyperules & (GTR_BUMPERS|GTR_CHECKPOINTS)) if ((player->pitblame > -1) && (player->pitblame < MAXPLAYERS)
&& (playeringame[player->pitblame]) && (!players[player->pitblame].spectator)
&& (players[player->pitblame].mo) && (!P_MobjWasRemoved(players[player->pitblame].mo)))
{ {
if ((player->pitblame > -1) && (player->pitblame < MAXPLAYERS) if (gametyperules & (GTR_BUMPERS|GTR_CHECKPOINTS))
&& (playeringame[player->pitblame]) && (!players[player->pitblame].spectator)
&& (players[player->pitblame].mo) && (!P_MobjWasRemoved(players[player->pitblame].mo)))
{
P_DamageMobj(player->mo, players[player->pitblame].mo, players[player->pitblame].mo, 1, DMG_KARMA); P_DamageMobj(player->mo, players[player->pitblame].mo, players[player->pitblame].mo, 1, DMG_KARMA);
player->pitblame = -1; else
} K_SpawnAmps(&players[player->pitblame], 20, player->mo);
else if (player->mo->health > 1 || K_Cooperative()) player->pitblame = -1;
{ }
else if (player->mo->health > 1 || K_Cooperative())
{
if (gametyperules & (GTR_BUMPERS|GTR_CHECKPOINTS))
player->mo->health--; player->mo->health--;
}
} }
if (modeattacking & ATTACKING_SPB) if (modeattacking & ATTACKING_SPB)