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 'doublezap' into 'master'

Browse source 
Item Thunderflow

Closes #220

See merge request KartKrew/Kart!544
This commit is contained in:
toaster 2022-03-12 18:32:29 +00:00
commit d7b72018ba
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_hud.c
View file

@ -1278,7 +1278,8 @@ static void K_drawKartItem(void)
localpatch = kp_sadface[offset]; localpatch = kp_sadface[offset];
break; break;
default: default:
return; localpatch = kp_nodraw; // diagnose underflows
break;
} }
if ((stplyr->pflags & PF_ITEMOUT) && !(leveltime & 1)) if ((stplyr->pflags & PF_ITEMOUT) && !(leveltime & 1))

8
src/k_kart.c
View file

@ -9252,9 +9252,17 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{ {
K_DoThunderShield(player); K_DoThunderShield(player);
if (player->itemamount > 0)
{
// Why is this a conditional?
// Thunder shield: the only item that allows you to
// activate a mine while you're out of its radius,
// the SAME tic it sets your itemamount to 0
// ...:dumbestass:
player->itemamount--; player->itemamount--;
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
} }
}
break; break;
case KITEM_BUBBLESHIELD: case KITEM_BUBBLESHIELD:
if (player->curshield != KSHIELD_BUBBLE) if (player->curshield != KSHIELD_BUBBLE)