incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bumpers on map spawn, Remove invincibility during comeback

Browse source
This commit is contained in:
NepDisk 2024-10-07 21:45:15 -04:00
parent 21a92702a5
commit 3d65b9a1f8
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -3382,8 +3382,6 @@ void K_HandleBumperChanges(player_t *player, UINT8 prevBumpers)
if (player->bumper > 0 && prevBumpers == 0)
{
K_DoInvincibility(player, 8 * TICRATE);
if (netgame)
{
CONS_Printf(M_GetText("%s is back in the game!\n"), player_names[player-players]);

11
src/p_mobj.c
View file

@ -10819,15 +10819,8 @@ void P_SpawnPlayer(INT32 playernum)
{
if ((leveltime < starttime) || (pcount <= 1)) // Start of the map?
{
if (leveltime > 2) // Reset those bumpers!
{
p->bumper = K_StartingBumperCount();
K_SpawnPlayerBattleBumpers(p);
}
else // temp, will get overwritten in K_BattleInit
{
p->bumper = 1;
}
p->bumper = K_StartingBumperCount();
K_SpawnPlayerBattleBumpers(p);
}
}
else if (p->bumper <= 0)