Okay, battle mode items respawn, for real now

This commit is contained in:
TehRealSalt 2017-10-24 21:22:09 -04:00
parent 0af023d8ca
commit ac55f0ea4d
3 changed files with 5 additions and 5 deletions

View file

@ -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;
}

View file

@ -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);
}

View file

@ -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