From a30563da22ce74b89215d740d8f52bf9e99e4347 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 21 Nov 2018 19:30:00 -0500 Subject: [PATCH] Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately --- src/k_kart.c | 6 +++++- src/p_mobj.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index a5882624..8bd08e26 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -574,6 +574,10 @@ static void K_KartGetItemResult(player_t *player, SINT8 getitem) player->kartstuff[k_itemtype] = KITEM_JAWZ; player->kartstuff[k_itemamount] = 2; break; + case KITEM_SPB: // Indirect items + case KITEM_SHRINK: + indirectitemcooldown = 30*TICRATE; + /* FALLTHRU */ default: 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 || player->kartstuff[k_itemtype] == KITEM_SHRINK || player->kartstuff[k_growshrinktimer] < 0) - indirectitemcooldown = 20*TICRATE; + indirectitemcooldown = 30*TICRATE; if (player->kartstuff[k_hyudorotimer] > 0) { diff --git a/src/p_mobj.c b/src/p_mobj.c index 585bd016..2cb12791 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8154,7 +8154,7 @@ void P_MobjThinker(mobj_t *mobj) mobj->threshold--; break; case MT_SPB: - indirectitemcooldown = 20*TICRATE; + indirectitemcooldown = 30*TICRATE; /* FALLTHRU */ case MT_BALLHOG: P_SpawnGhostMobj(mobj)->fuse = 3;