diff --git a/src/k_battle.c b/src/k_battle.c index 64673953d..8b8918d3d 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -801,24 +801,6 @@ void K_BattleInit(boolean singleplayercontext) 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.previousId = Obj_GetFirstBattleUFOSpawnerID(); } diff --git a/src/p_mobj.c b/src/p_mobj.c index 0bcda4ad5..a7e486038 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -12090,13 +12090,8 @@ void P_SpawnPlayer(INT32 playernum) 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()); - K_SpawnPlayerBattleBumpers(p); - } + mobj->health = K_BumpersToHealth(K_StartingBumperCount()); + K_SpawnPlayerBattleBumpers(p); } // Block visuals