From 28a65043f95981a1cb2e95e6521099eee907bdfd Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Wed, 14 Jun 2023 23:45:20 -0700 Subject: [PATCH] Autofire Ring Box items --- src/k_kart.c | 12 ++++++------ src/k_roulette.c | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index f1144f364..b35ab439d 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -11431,42 +11431,42 @@ void K_MoveKartPlayer(player_t *player, boolean onground) } break; case KITEM_BAR: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + if (player->karthud[khud_itemblink] < 1) { K_AwardPlayerRings(player, 10, true); player->itemamount--; } break; case KITEM_DOUBLEBAR: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + if (player->karthud[khud_itemblink] < 1) { K_AwardPlayerRings(player, 20, true); player->itemamount--; } break; case KITEM_TRIPLEBAR: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + if (player->karthud[khud_itemblink] < 1) { K_AwardPlayerRings(player, 30, true); player->itemamount--; } break; case KITEM_SLOTRING: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + if (player->karthud[khud_itemblink] < 1) { K_AwardPlayerRings(player, 50, true); player->itemamount--; } break; case KITEM_SEVEN: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + if (player->karthud[khud_itemblink] < 1) { K_AwardPlayerRings(player, 77, true); player->itemamount--; } break; case KITEM_JACKPOT: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + if (player->karthud[khud_itemblink] < 1) { K_AwardPlayerRings(player, 150, true); player->itemamount--; diff --git a/src/k_roulette.c b/src/k_roulette.c index a6caea8b1..835108d52 100644 --- a/src/k_roulette.c +++ b/src/k_roulette.c @@ -1628,7 +1628,10 @@ void K_KartItemRoulette(player_t *const player, ticcmd_t *const cmd) if (P_IsDisplayPlayer(player) && !demo.freecam) { - S_StartSound(NULL, sfx_itrolf); + if (roulette->ringbox) + S_StartSound(NULL, sfx_s245); + else + S_StartSound(NULL, sfx_itrolf); } }