From c8da95cbda0cf59f7f99c2d8c2f5f42d2e999ed8 Mon Sep 17 00:00:00 2001 From: Sally Cochenour Date: Thu, 9 Apr 2020 21:05:46 -0400 Subject: [PATCH] Revert "Fix being able to hold items to get them as early as possible" This reverts commit 43732b386d65619d4a2b259093c35e2bc03abaf9. --- src/k_kart.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 1f0eb3462..7ad459ad1 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1150,21 +1150,17 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd) // If the roulette finishes or the player presses BT_ATTACK, stop the roulette and calculate the item. // I'm returning via the exact opposite, however, to forgo having another bracket embed. Same result either way, I think. // Finally, if you get past this check, now you can actually start calculating what item you get. - if (((cmd->buttons & BT_ATTACK) && !(player->pflags & PF_ATTACKDOWN)) - && (player->kartstuff[k_itemroulette] >= roulettestop) + if ((cmd->buttons & BT_ATTACK) && (player->kartstuff[k_itemroulette] >= roulettestop) && !(player->kartstuff[k_eggmanheld] || player->kartstuff[k_itemheld] || player->kartstuff[k_userings])) { // Mashing reduces your chances for the good items mashed = FixedDiv((player->kartstuff[k_itemroulette])*FRACUNIT, ((TICRATE*3)+roulettestop)*FRACUNIT) - FRACUNIT; } - else - { - if (cmd->buttons & BT_ATTACK) - player->pflags |= PF_ATTACKDOWN; + else if (!(player->kartstuff[k_itemroulette] >= (TICRATE*3))) + return; - if (!(player->kartstuff[k_itemroulette] >= (TICRATE*3))) - return; - } + if (cmd->buttons & BT_ATTACK) + player->pflags |= PF_ATTACKDOWN; for (i = 0; i < MAXPLAYERS; i++) {