From f6e6c2010ebcf7d88b06954a7c539e73516a10c7 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 27 Nov 2021 01:21:46 -0800 Subject: [PATCH] Reintroduce battle overtime barrier minimum radius - 768 fracunit minimum. - Emerald spawning arc reduced so they spawn right next to the barrier at minimum radius. - Items always spawn. --- src/k_battle.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/k_battle.c b/src/k_battle.c index 5fc7cc05a..c33ea6bcc 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -179,7 +179,7 @@ mobj_t *K_SpawnChaosEmerald(fixed_t x, fixed_t y, fixed_t z, angle_t angle, SINT P_Thrust(emerald, FixedAngle(P_RandomFixed() * 180) + angle, - 32 * mapobjectscale); + 24 * mapobjectscale); emerald->momz = flip * 24 * mapobjectscale; if (emerald->eflags & MFE_UNDERWATER) @@ -288,12 +288,6 @@ void K_RunPaperItemSpawners(void) if (overtime == true) { - if (battleovertime.radius < 512*mapobjectscale) - { - // Barrier has closed in too much - return; - } - // Double frequency of items interval /= 2; } @@ -557,10 +551,12 @@ void K_RunBattleOvertime(void) } else if (battleovertime.radius > 0) { - if (battleovertime.radius > 2*mapobjectscale) + const fixed_t minradius = 768 * mapobjectscale; + + if (battleovertime.radius > minradius) battleovertime.radius -= 2*mapobjectscale; else - battleovertime.radius = 0; + battleovertime.radius = minradius; } if (battleovertime.radius > 0)