thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

K_PlayerGuard: always disable if player is in damage state

Browse source 
- Fixes Barrier power-up not being interrupted by damage
  state
This commit is contained in:
James R 2024-01-12 17:56:44 -08:00
parent b6a725ad7b
commit f2f2b41034
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_kart.c
View file

@ -10790,6 +10790,11 @@ boolean K_PlayerGuard(const player_t *player)
return false; return false;
} }
if (P_PlayerInPain(player) == true)
{
return false;
}
if (K_PowerUpRemaining(player, POWERUP_BARRIER)) if (K_PowerUpRemaining(player, POWERUP_BARRIER))
{ {
return true; return true;
@ -10814,7 +10819,6 @@ boolean K_PlayerGuard(const player_t *player)
if (K_PressingEBrake(player) == true if (K_PressingEBrake(player) == true
&& (player->drift == 0 || P_IsObjectOnGround(player->mo) == false) && (player->drift == 0 || P_IsObjectOnGround(player->mo) == false)
&& P_PlayerInPain(player) == false
&& player->spindashboost == 0 && player->spindashboost == 0
&& player->nocontrol == 0) && player->nocontrol == 0)
{ {