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

Don't lose rings with a shield on hit

Browse source
This commit is contained in:
TehRealSalt 2019-03-09 16:39:43 -05:00
parent 955e5d9c80
commit 8c79e57f89
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_inter.c
View file

@ -3289,6 +3289,10 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
if (!player) if (!player)
return; return;
// Has a shield? Don't lose your rings!
if (player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD)
return;
// 20 is the ring cap in kart // 20 is the ring cap in kart
if (num_rings > 20) if (num_rings > 20)
num_rings = 20; num_rings = 20;

8
src/p_user.c
View file

@ -1083,10 +1083,12 @@ void P_PlayLivesJingle(player_t *player)
void P_PlayRinglossSound(mobj_t *source) void P_PlayRinglossSound(mobj_t *source)
{ {
if (source->player && source->player->kartstuff[k_rings] <= 0) if (source->player && source->player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD)
S_StartSound(source, sfx_s1a6); S_StartSound(source, sfx_s1a3); // Shield hit (no ring loss)
else if (source->player && source->player->kartstuff[k_rings] <= 0)
S_StartSound(source, sfx_s1a6); // Ring debt (lessened ring loss)
else else
S_StartSound(source, sfx_s1c6); S_StartSound(source, sfx_s1c6); // Normal ring loss sound
} }
void P_PlayDeathSound(mobj_t *source) void P_PlayDeathSound(mobj_t *source)