stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 13:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately

Browse source
This commit is contained in:
TehRealSalt 2018-11-21 19:30:00 -05:00
parent f65a8796df
commit a30563da22
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_kart.c
View file

@ -574,6 +574,10 @@ static void K_KartGetItemResult(player_t *player, SINT8 getitem)
player->kartstuff[k_itemtype] = KITEM_JAWZ; player->kartstuff[k_itemtype] = KITEM_JAWZ;
player->kartstuff[k_itemamount] = 2; player->kartstuff[k_itemamount] = 2;
break; break;
case KITEM_SPB: // Indirect items
case KITEM_SHRINK:
indirectitemcooldown = 30*TICRATE;
/* FALLTHRU */
default: default:
if (getitem <= 0 || getitem >= NUMKARTRESULTS) // Sad (Fallback) if (getitem <= 0 || getitem >= NUMKARTRESULTS) // Sad (Fallback)
{ {
@ -5250,7 +5254,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (player->kartstuff[k_itemtype] == KITEM_SPB if (player->kartstuff[k_itemtype] == KITEM_SPB
|| player->kartstuff[k_itemtype] == KITEM_SHRINK || player->kartstuff[k_itemtype] == KITEM_SHRINK
|| player->kartstuff[k_growshrinktimer] < 0) || player->kartstuff[k_growshrinktimer] < 0)
indirectitemcooldown = 20*TICRATE; indirectitemcooldown = 30*TICRATE;
if (player->kartstuff[k_hyudorotimer] > 0) if (player->kartstuff[k_hyudorotimer] > 0)
{ {

2
src/p_mobj.c
View file

@ -8154,7 +8154,7 @@ void P_MobjThinker(mobj_t *mobj)
mobj->threshold--; mobj->threshold--;
break; break;
case MT_SPB: case MT_SPB:
indirectitemcooldown = 20*TICRATE; indirectitemcooldown = 30*TICRATE;
/* FALLTHRU */ /* FALLTHRU */
case MT_BALLHOG: case MT_BALLHOG:
P_SpawnGhostMobj(mobj)->fuse = 3; P_SpawnGhostMobj(mobj)->fuse = 3;