From 754c48327e9694aeb6f8f892ca09d70655fc9397 Mon Sep 17 00:00:00 2001 From: RGreenlees Date: Tue, 13 Feb 2024 23:19:10 +0000 Subject: [PATCH] Fixed bug with ladder climbing --- main/source/mod/AIPlayers/AvHAINavigation.cpp | 6 +++--- main/source/mod/AIPlayers/AvHAIPlayerManager.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/source/mod/AIPlayers/AvHAINavigation.cpp b/main/source/mod/AIPlayers/AvHAINavigation.cpp index 98132db1..b92132d9 100644 --- a/main/source/mod/AIPlayers/AvHAINavigation.cpp +++ b/main/source/mod/AIPlayers/AvHAINavigation.cpp @@ -3408,8 +3408,9 @@ void LadderMove(AvHAIPlayer* pBot, const Vector StartPoint, const Vector EndPoin return; } + Vector nearestLadderTop = UTIL_GetNearestLadderTopPoint(pEdict); - if (bIsGoingUpLadder && (pBot->CollisionHullTopLocation.z > EndPoint.z)) + if (bIsGoingUpLadder && ((pBot->CollisionHullTopLocation.z > EndPoint.z) || (pBot->Edict->v.origin.z > nearestLadderTop.z))) { pBot->desiredMovementDir = vForward; @@ -3428,8 +3429,7 @@ void LadderMove(AvHAIPlayer* pBot, const Vector StartPoint, const Vector EndPoin return; } - - Vector nearestLadderTop = UTIL_GetNearestLadderTopPoint(pEdict); + if (pBot->Edict->v.origin.z < nearestLadderTop.z) { diff --git a/main/source/mod/AIPlayers/AvHAIPlayerManager.cpp b/main/source/mod/AIPlayers/AvHAIPlayerManager.cpp index 182f5dd5..4a0efde6 100644 --- a/main/source/mod/AIPlayers/AvHAIPlayerManager.cpp +++ b/main/source/mod/AIPlayers/AvHAIPlayerManager.cpp @@ -623,7 +623,7 @@ void AIMGR_UpdateAIPlayers() UpdateBotChat(bot); - AIPlayerThink(bot); + DroneThink(bot); EndBotFrame(bot);