From 59f91fc065169f194d0f12e4cb6990956b1697f6 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Wed, 21 Oct 2020 18:12:58 +0000 Subject: [PATCH] SoldierAI: exclude civilians. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8908 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- TacticalAI/AIUtils.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/TacticalAI/AIUtils.cpp b/TacticalAI/AIUtils.cpp index 56849ea0..88933e6f 100644 --- a/TacticalAI/AIUtils.cpp +++ b/TacticalAI/AIUtils.cpp @@ -4844,8 +4844,13 @@ BOOLEAN SoldierAI(SOLDIERTYPE *pSoldier) { CHECKF(pSoldier); + BOOLEAN fCivilian = (PTR_CIVILIAN && (pSoldier->ubCivilianGroup == NON_CIV_GROUP || + (pSoldier->aiData.bNeutral && gTacticalStatus.fCivGroupHostile[pSoldier->ubCivilianGroup] == CIV_GROUP_NEUTRAL) || + (pSoldier->ubBodyType >= FATCIV && pSoldier->ubBodyType <= CRIPPLECIV))); + if (!IS_MERC_BODY_TYPE(pSoldier) || pSoldier->aiData.bNeutral || + fCivilian || pSoldier->flags.uiStatusFlags & SOLDIER_BOXER || ARMED_VEHICLE(pSoldier) || pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ||