mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 12:31:54 +00:00
Okay, battle mode items respawn, for real now
This commit is contained in:
parent
0af023d8ca
commit
ac55f0ea4d
3 changed files with 5 additions and 5 deletions
|
|
@ -8469,9 +8469,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
|
||||||
case MT_BLUEBALL:
|
case MT_BLUEBALL:
|
||||||
nummaprings++;
|
nummaprings++;
|
||||||
break;
|
break;
|
||||||
case MT_RANDOMITEM:
|
|
||||||
nummapboxes++;
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -983,6 +983,9 @@ static void P_LoadThings(void)
|
||||||
|| mt->type == 1702) // MT_AXISTRANSFERLINE
|
|| mt->type == 1702) // MT_AXISTRANSFERLINE
|
||||||
continue; // These were already spawned
|
continue; // These were already spawned
|
||||||
|
|
||||||
|
if (mt->type == 2000) // MT_RANDOMITEM
|
||||||
|
nummapboxes++;
|
||||||
|
|
||||||
mt->mobj = NULL;
|
mt->mobj = NULL;
|
||||||
P_SpawnMapThing(mt);
|
P_SpawnMapThing(mt);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7974,8 +7974,8 @@ static void P_DeathThink(player_t *player)
|
||||||
if (player->deadtimer > TICRATE)
|
if (player->deadtimer > TICRATE)
|
||||||
player->playerstate = PST_REBORN;
|
player->playerstate = PST_REBORN;
|
||||||
|
|
||||||
// SRB2kart - spawn after 5 tics & Button press
|
// SRB2kart - spawn after 1 second & Button press
|
||||||
if ((cmd->buttons & BT_JUMP || cmd->buttons & BT_ACCELERATE) && player->deadtimer > 5)
|
if ((cmd->buttons & BT_JUMP || cmd->buttons & BT_ACCELERATE) && player->deadtimer > TICRATE)
|
||||||
player->playerstate = PST_REBORN;
|
player->playerstate = PST_REBORN;
|
||||||
|
|
||||||
// Single player auto respawn
|
// Single player auto respawn
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue