From ac55f0ea4d2266fcd1ae4ef7f3ba919cdf62464b Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Tue, 24 Oct 2017 21:22:09 -0400 Subject: [PATCH] Okay, battle mode items respawn, for real now --- src/p_mobj.c | 3 --- src/p_setup.c | 3 +++ src/p_user.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 52683a9f..f5df3010 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8469,9 +8469,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) case MT_BLUEBALL: nummaprings++; break; - case MT_RANDOMITEM: - nummapboxes++; - break; default: break; } diff --git a/src/p_setup.c b/src/p_setup.c index aa569471..c272464f 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -983,6 +983,9 @@ static void P_LoadThings(void) || mt->type == 1702) // MT_AXISTRANSFERLINE continue; // These were already spawned + if (mt->type == 2000) // MT_RANDOMITEM + nummapboxes++; + mt->mobj = NULL; P_SpawnMapThing(mt); } diff --git a/src/p_user.c b/src/p_user.c index 594f2078..c11bf8d1 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -7974,8 +7974,8 @@ static void P_DeathThink(player_t *player) if (player->deadtimer > TICRATE) player->playerstate = PST_REBORN; - // SRB2kart - spawn after 5 tics & Button press - if ((cmd->buttons & BT_JUMP || cmd->buttons & BT_ACCELERATE) && player->deadtimer > 5) + // SRB2kart - spawn after 1 second & Button press + if ((cmd->buttons & BT_JUMP || cmd->buttons & BT_ACCELERATE) && player->deadtimer > TICRATE) player->playerstate = PST_REBORN; // Single player auto respawn