Merge branch 'whitespace' into 'master'

Remove trailing whitespace

See merge request KartKrew/Kart!175
This commit is contained in:
Sal 2019-09-27 14:37:40 -04:00
commit dca76c3f08
2 changed files with 3 additions and 3 deletions

View file

@ -447,7 +447,7 @@ static void D_Display(void)
{ {
if (i > 0) // Splitscreen-specific if (i > 0) // Splitscreen-specific
{ {
switch (i) switch (i)
{ {
case 1: case 1:
if (splitscreen > 1) if (splitscreen > 1)

View file

@ -3306,12 +3306,12 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
// 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;
else if (num_rings <= 0) else if (num_rings <= 0)
return; return;
// Cap the maximum loss automatically to 2 in ring debt // Cap the maximum loss automatically to 2 in ring debt
if (player->kartstuff[k_rings] <= 0 && num_rings > 2) if (player->kartstuff[k_rings] <= 0 && num_rings > 2)
num_rings = 2; num_rings = 2;
P_GivePlayerRings(player, -num_rings); P_GivePlayerRings(player, -num_rings);