From 313d2f8fd2dedd2fdf67a9e3d69d4042c6baaa38 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 30 Jun 2023 19:23:59 -0700 Subject: [PATCH] During Overtime: point Servant Hand to Battle Kiosk, stop pointing to UFOs --- src/k_battle.c | 7 +++++++ src/objects/battle-ufo.cpp | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/k_battle.c b/src/k_battle.c index d7566257b..f6844cdb0 100644 --- a/src/k_battle.c +++ b/src/k_battle.c @@ -673,6 +673,13 @@ void K_RunBattleOvertime(void) if (battleovertime.radius < minradius) battleovertime.radius = minradius; + + // Subtract the 10 second grace period of the barrier + if (battleovertime.enabled < 25*TICRATE) + { + battleovertime.enabled++; + Obj_PointPlayersToXY(battleovertime.x, battleovertime.y); + } } if (battleovertime.radius > 0) diff --git a/src/objects/battle-ufo.cpp b/src/objects/battle-ufo.cpp index 12a982309..b7aff6296 100644 --- a/src/objects/battle-ufo.cpp +++ b/src/objects/battle-ufo.cpp @@ -133,7 +133,10 @@ void Obj_BattleUFOThink(mobj_t *mobj) ufo->spawn_beam(); } - Obj_PointPlayersToXY(mobj->x, mobj->y); + if (!battleovertime.enabled) + { + Obj_PointPlayersToXY(mobj->x, mobj->y); + } } void Obj_BattleUFODeath(mobj_t *mobj)