1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow enemy to retreat (#279)

Browse Source 
This check was preventing enemies from retreating into another sector if tactical AI retreat was enabled, leading into AI deadlock every time AI_ACTION_RUNAWAY was the decision.
This commit is contained in:
Asdow
2024-02-11 00:27:14 +02:00
committed by GitHub
parent 28a4db0355
commit ef69f9b2e6
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+11 -5
View File
@@ -5081,11 +5081,17 @@ BOOLEAN NewOKDestination( SOLDIERTYPE * pCurrSoldier, INT32 sGridNo, BOOLEAN fPe
INT16 sDesiredLevel; INT16 sDesiredLevel;
BOOLEAN fOKCheckStruct; BOOLEAN fOKCheckStruct;
// sevenfm: allow civilians and NPCs with profile to go off screen // Allow civilians and NPCs with profile to go off screen, and also enemies if tactical retreat is enabled
if (!GridNoOnVisibleWorldTile(sGridNo) && (pCurrSoldier->bTeam != CIV_TEAM || pCurrSoldier->ubProfile == NO_PROFILE)) auto destinationOffscreen = !(GridNoOnVisibleWorldTile(sGridNo));
{ auto hasProfile = pCurrSoldier->ubProfile != NO_PROFILE;
return(FALSE); auto isCivilian = pCurrSoldier->bTeam == CIV_TEAM;
} auto isEnemy = pCurrSoldier->bTeam == ENEMY_TEAM;
auto retreatAllowed = gGameExternalOptions.fAITacticalRetreat == true;
if (destinationOffscreen && !(isCivilian || hasProfile || (isEnemy && retreatAllowed)))
{
return(FALSE);
}
if (fPeopleToo && ( bPerson = WhoIsThere2( sGridNo, bLevel ) ) != NOBODY ) if (fPeopleToo && ( bPerson = WhoIsThere2( sGridNo, bLevel ) ) != NOBODY )
{ {