thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 19:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always set starting bumpers in P_SpawnPlayer

Browse source
This commit is contained in:
James R. 2023-10-01 15:48:05 -07:00 • committed by James R
parent f195b9742a
commit bcd4963f2e
2 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/k_battle.c
View file

@ -801,24 +801,6 @@ void K_BattleInit(boolean singleplayercontext)
battleprisons = true; battleprisons = true;
} }
if (gametyperules & GTR_BUMPERS)
{
const INT32 startingHealth = K_BumpersToHealth(K_StartingBumperCount());
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].spectator)
continue;
if (players[i].mo)
{
players[i].mo->health = startingHealth;
}
K_SpawnPlayerBattleBumpers(players+i);
}
}
g_battleufo.due = starttime; g_battleufo.due = starttime;
g_battleufo.previousId = Obj_GetFirstBattleUFOSpawnerID(); g_battleufo.previousId = Obj_GetFirstBattleUFOSpawnerID();
} }

5
src/p_mobj.c
View file

@ -12089,15 +12089,10 @@ void P_SpawnPlayer(INT32 playernum)
} }
if ((gametyperules & GTR_BUMPERS) && !p->spectator) if ((gametyperules & GTR_BUMPERS) && !p->spectator)
{
// At leveltime == 2, K_TimerInit will get called and reset
// the bumpers to the initial value for the level.
if (leveltime > 2) // Reset those bumpers!
{ {
mobj->health = K_BumpersToHealth(K_StartingBumperCount()); mobj->health = K_BumpersToHealth(K_StartingBumperCount());
K_SpawnPlayerBattleBumpers(p); K_SpawnPlayerBattleBumpers(p);
} }
}
// Block visuals // Block visuals
// (These objects track whether a player is block-eligible on their own, no worries) // (These objects track whether a player is block-eligible on their own, no worries)