From 2016caa70b584286af7aff80e83eb63c32f16534 Mon Sep 17 00:00:00 2001
From: Shane Ellis <cobaltbw@gmail.com>
Date: Sat, 23 Jan 2021 10:16:27 -0500
Subject: [PATCH] Update references to player->bot
---
src/p_mobj.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index a660a8a928..43d81077e2 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1839,10 +1839,9 @@ void P_XYMovement(mobj_t *mo)
// blocked move
moved = false;
- if (player) {
- if (player->bot && player->bot != 3)
- B_MoveBlocked(player);
- }
+ //!!!
+ if (player)
+ B_MoveBlocked(player);
if (LUAh_MobjMoveBlocked(mo))
{
@@ -4135,7 +4134,7 @@ boolean P_BossTargetPlayer(mobj_t *actor, boolean closest)
player = &players[actor->lastlook];
- if (player->pflags & PF_INVIS || (player->bot && player->bot != 3) || player->spectator)
+ if (player->pflags & PF_INVIS || player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN || player->spectator)
continue; // ignore notarget
if (!player->mo || P_MobjWasRemoved(player->mo))
@@ -4176,7 +4175,7 @@ boolean P_SupermanLook4Players(mobj_t *actor)
if (players[c].pflags & PF_INVIS)
continue; // ignore notarget
- if (!players[c].mo || players[c].bot)
+ if (!players[c].mo || players[c].bot == BOT_2PAI || players[c].bot == BOT_2PHUMAN)
continue;
if (players[c].mo->health <= 0)
@@ -7307,7 +7306,7 @@ static void P_RosySceneryThink(mobj_t *mobj)
continue;
if (!players[i].mo)
continue;
- if (players[i].bot)
+ if (players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN)
continue;
if (!players[i].mo->health)
continue;
--
GitLab