mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
SoldierAI: exclude civilians.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8908 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -4844,8 +4844,13 @@ BOOLEAN SoldierAI(SOLDIERTYPE *pSoldier)
|
|||||||
{
|
{
|
||||||
CHECKF(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) ||
|
if (!IS_MERC_BODY_TYPE(pSoldier) ||
|
||||||
pSoldier->aiData.bNeutral ||
|
pSoldier->aiData.bNeutral ||
|
||||||
|
fCivilian ||
|
||||||
pSoldier->flags.uiStatusFlags & SOLDIER_BOXER ||
|
pSoldier->flags.uiStatusFlags & SOLDIER_BOXER ||
|
||||||
ARMED_VEHICLE(pSoldier) ||
|
ARMED_VEHICLE(pSoldier) ||
|
||||||
pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ||
|
pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE ||
|
||||||
|
|||||||
Reference in New Issue
Block a user