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

Revert "Add K_UpdateDamageFlashing, refactor Battle 0-flashing tics"

Browse source 
This reverts commit 3856fbf1c6.
This commit is contained in:
James R 2024-01-13 12:52:09 -08:00
parent da2e6f1bfe
commit a349b1acf0
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/k_kart.c
View file

@ -3550,6 +3550,11 @@ UINT16 K_GetKartFlashing(const player_t *player)
{ {
UINT16 tics = flashingtics; UINT16 tics = flashingtics;
if (gametyperules & GTR_BUMPERS)
{
return 0;
}
if (player == NULL) if (player == NULL)
{ {
return tics; return tics;
@ -3559,16 +3564,6 @@ UINT16 K_GetKartFlashing(const player_t *player)
return tics; return tics;
} }
void K_UpdateDamageFlashing(player_t *player, UINT16 tics)
{
if (gametyperules & GTR_BUMPERS)
{
return;
}
player->flashing = tics;
}
boolean K_PlayerShrinkCheat(const player_t *player) boolean K_PlayerShrinkCheat(const player_t *player)
{ {
return ( return (
@ -8396,9 +8391,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->spinouttimer != 0) if (player->spinouttimer != 0)
{ {
if (( player->spinouttype & KSPIN_IFRAMES ) == 0) if (( player->spinouttype & KSPIN_IFRAMES ) == 0)
K_UpdateDamageFlashing(player, 0); player->flashing = 0;
else else
K_UpdateDamageFlashing(player, K_GetKartFlashing(player)); player->flashing = K_GetKartFlashing(player);
} }
if (player->spinouttimer) if (player->spinouttimer)

1
src/k_kart.h
View file

@ -192,7 +192,6 @@ fixed_t K_GetKartSpeedFromStat(UINT8 kartspeed);
fixed_t K_GetKartSpeed(const player_t *player, boolean doboostpower, boolean dorubberbanding); fixed_t K_GetKartSpeed(const player_t *player, boolean doboostpower, boolean dorubberbanding);
fixed_t K_GetKartAccel(const player_t *player); fixed_t K_GetKartAccel(const player_t *player);
UINT16 K_GetKartFlashing(const player_t *player); UINT16 K_GetKartFlashing(const player_t *player);
void K_UpdateDamageFlashing(player_t *player, UINT16 tics);
boolean K_PlayerShrinkCheat(const player_t *player); boolean K_PlayerShrinkCheat(const player_t *player);
void K_UpdateShrinkCheat(player_t *player); void K_UpdateShrinkCheat(player_t *player);
boolean K_KartKickstart(const player_t *player); boolean K_KartKickstart(const player_t *player);

2
src/p_inter.c
View file

@ -3341,7 +3341,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (type != DMG_STUMBLE && type != DMG_WHUMBLE) if (type != DMG_STUMBLE && type != DMG_WHUMBLE)
{ {
if (type != DMG_STING) if (type != DMG_STING)
K_UpdateDamageFlashing(player, K_GetKartFlashing(player)); player->flashing = K_GetKartFlashing(player);
player->ringburst += ringburst; player->ringburst += ringburst;