From 581b989fe47f343a71066bed59568d74fb85c965 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sat, 26 Nov 2022 20:46:37 -0500 Subject: [PATCH] Fix bots being unable to trigger UDMF regression --- src/p_enemy.c | 3 --- src/p_mobj.c | 2 +- src/p_spec.c | 7 ++----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 0db891f81..131e92bf7 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -750,9 +750,6 @@ boolean P_LookForPlayers(mobj_t *actor, boolean allaround, boolean tracer, fixed if (player->mo->health <= 0) continue; // dead - if (player->bot) - continue; // ignore bots - if (dist > 0 && P_AproxDistance(P_AproxDistance(player->mo->x - actor->x, player->mo->y - actor->y), player->mo->z - actor->z) > dist) continue; // Too far away diff --git a/src/p_mobj.c b/src/p_mobj.c index 814aa6b57..0613d816c 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -4538,7 +4538,7 @@ boolean P_SupermanLook4Players(mobj_t *actor) { if (playeringame[c] && !players[c].spectator) { - if (!players[c].mo || players[c].bot) + if (!players[c].mo) continue; if (players[c].mo->health <= 0) diff --git a/src/p_spec.c b/src/p_spec.c index 4abe9f5e1..56eb3d941 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -4282,7 +4282,7 @@ boolean P_IsPlayerValid(size_t playernum) boolean P_CanPlayerTrigger(size_t playernum) { - return P_IsPlayerValid(playernum) && !players[playernum].bot; + return P_IsPlayerValid(playernum); } /// \todo check continues for proper splitscreen support? @@ -4310,7 +4310,7 @@ static void P_ProcessEggCapsule(player_t *player, sector_t *sector) mobj_t *mo2; INT32 i; - if (player->bot || sector->ceilingdata || sector->floordata) + if (sector->ceilingdata || sector->floordata) return; // Find the center of the Eggtrap and release all the pretty animals! @@ -4517,9 +4517,6 @@ static void P_EvaluateDamageType(player_t *player, sector_t *sector, boolean isT static void P_EvaluateLinedefExecutorTrigger(player_t *player, sector_t *sector, boolean isTouching) { - if (player->bot) - return; - if (!sector->triggertag) return;