ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-21 20:21:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash on marine victory in combat

Browse source 
* Fixed a bug where bots could crash when marines successfully destroy the alien hive in CO
This commit is contained in:
RGreenlees 2024-06-03 16:55:00 +01:00 committed by pierow
parent 2b27b90f25
commit 5b83a4c886
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main/source/mod/AvHAIPlayer.cpp
View file

@ -5217,7 +5217,7 @@ void AIPlayerSetPrimaryCOMarineTask(AvHAIPlayer* pBot, AvHAIPlayerTask* Task)
if (randbool()) if (randbool())
{ {
Vector RandomVisitPoint = UTIL_GetRandomPointOnNavmeshInDonut(pBot->BotNavInfo.NavProfile, StructureToAttack->v.origin, UTIL_MetresToGoldSrcUnits(20.0f), UTIL_MetresToGoldSrcUnits(40.0f)); Vector RandomVisitPoint = UTIL_GetRandomPointOnNavmeshInDonut(pBot->BotNavInfo.NavProfile, UTIL_GetEntityGroundLocation(StructureToAttack), UTIL_MetresToGoldSrcUnits(20.0f), UTIL_MetresToGoldSrcUnits(40.0f));
if (!vIsZero(RandomVisitPoint)) if (!vIsZero(RandomVisitPoint))
{ {
@ -5227,8 +5227,6 @@ void AIPlayerSetPrimaryCOMarineTask(AvHAIPlayer* pBot, AvHAIPlayerTask* Task)
} }
AITASK_SetAttackTask(pBot, Task, StructureToAttack, false); AITASK_SetAttackTask(pBot, Task, StructureToAttack, false);
} }
void AIPlayerSetSecondaryCOMarineTask(AvHAIPlayer* pBot, AvHAIPlayerTask* Task) void AIPlayerSetSecondaryCOMarineTask(AvHAIPlayer* pBot, AvHAIPlayerTask* Task)
@ -5582,6 +5580,8 @@ void AIPlayerSetSecondaryCOAlienTask(AvHAIPlayer* pBot, AvHAIPlayerTask* Task)
const AvHAIHiveDefinition* TheHive = AITAC_GetNearestTeamHive(BotTeam, pBot->Edict->v.origin, true); const AvHAIHiveDefinition* TheHive = AITAC_GetNearestTeamHive(BotTeam, pBot->Edict->v.origin, true);
if (!TheHive) { return; }
if (TheHive->bIsUnderAttack) if (TheHive->bIsUnderAttack)
{ {
int NumAttackers = AITAC_GetNumPlayersOfTeamInArea(EnemyTeam, TheHive->FloorLocation, UTIL_MetresToGoldSrcUnits(15.0f), false, nullptr, AVH_USER3_NONE); int NumAttackers = AITAC_GetNumPlayersOfTeamInArea(EnemyTeam, TheHive->FloorLocation, UTIL_MetresToGoldSrcUnits(15.0f), false, nullptr, AVH_USER3_NONE);
@ -5934,6 +5934,10 @@ bool ShouldBotThink(AvHAIPlayer* pBot)
void BotResumePlay(AvHAIPlayer* pBot) void BotResumePlay(AvHAIPlayer* pBot)
{ {
pBot->BotNavInfo.LastNavMeshPosition = g_vecZero;
pBot->BotNavInfo.LastNavMeshCheckPosition = g_vecZero;
pBot->BotNavInfo.LastOpenLocation = g_vecZero;
ClearBotMovement(pBot); ClearBotMovement(pBot);
SetBaseNavProfile(pBot); SetBaseNavProfile(pBot);