Reduce AI deadlocks

Tactical/Boxing.cpp

@@ -22,6 +22,7 @@
 	#include "Font Control.h"
 	#include "message.h"
 	#include "GameSettings.h" // added by SANDRO
+	#include "Soldier macros.h"
 
 INT32	gsBoxerGridNo[ NUM_BOXERS ] = { 11393, 11233, 11073 };
 UINT8 gubBoxerID[ NUM_BOXERS ] = { NOBODY, NOBODY, NOBODY };
@@ -55,7 +56,7 @@ void ExitBoxing( void )
 
 			if ( pSoldier != NULL )
 			{
-				if ( ( pSoldier->flags.uiStatusFlags & SOLDIER_BOXER ) && InARoom( pSoldier->sGridNo, &usRoom ) && usRoom == BOXING_RING )
+				if ( BOXER(pSoldier) && InARoom( pSoldier->sGridNo, &usRoom ) && usRoom == BOXING_RING )
 				{
 					if ( pSoldier->flags.uiStatusFlags & SOLDIER_PC )
 					{
@@ -239,7 +240,7 @@ void CountPeopleInBoxingRingAndDoActions( void )
 				{
 					++ubPlayersInRing;
 
-					if ( !pNonBoxingPlayer && !(pSoldier->flags.uiStatusFlags & SOLDIER_BOXER) )
+					if ( !pNonBoxingPlayer && !BOXER(pSoldier) )
 					{
 						pNonBoxingPlayer = pSoldier;
 					}
@@ -291,7 +292,7 @@ void CountPeopleInBoxingRingAndDoActions( void )
 				// ladieees and gennleman, we have a fight!
 				for (uiLoop = 0; uiLoop < 2; ++uiLoop)
 				{
-					if (!(pInRing[uiLoop]->flags.uiStatusFlags & SOLDIER_BOXER))
+					if (!BOXER(pInRing[uiLoop]))
 					{
 						// set as boxer!
 						pInRing[uiLoop]->flags.uiStatusFlags |= SOLDIER_BOXER;
@@ -515,7 +516,7 @@ void BoxingMovementCheck( SOLDIERTYPE * pSoldier )
 		// someone moving in/into the ring
 		CountPeopleInBoxingRingAndDoActions();
 	}
-	else if ( ( gTacticalStatus.bBoxingState == BOXING ) && ( pSoldier->flags.uiStatusFlags & SOLDIER_BOXER ) )
+	else if ( ( gTacticalStatus.bBoxingState == BOXING ) && BOXER(pSoldier) )
 	{
 		// boxer stepped out of the ring!
 		BoxingPlayerDisqualified( pSoldier, BOXER_OUT_OF_RING );
@@ -565,7 +566,7 @@ void ClearAllBoxerFlags( void )
 {
 	for (UINT32 uiSlot = 0; uiSlot < guiNumMercSlots; ++uiSlot)
 	{
-		if ( MercSlots[ uiSlot ] && MercSlots[ uiSlot ]->flags.uiStatusFlags & SOLDIER_BOXER )
+		if ( MercSlots[ uiSlot ] && BOXER(MercSlots[ uiSlot ]) )
 		{
 			// Flugente: nuke the entire opponent count, remove boxing flag, reevaluate opponent list
 			DecayIndividualOpplist(MercSlots[uiSlot]);

Tactical/Handle UI.cpp

@@ -87,7 +87,7 @@
 #include "SaveLoadScreen.h"
 #include "Map Screen Interface.h"	// added by Flugente for SquadNames
 #include "Keys.h"	// added by silversurfer for door handling from the side
-
+#include "Cheats.h"
 #include "AIInternals.h"
 extern BOOLEAN gubWorldTileInLight[MAX_ALLOWED_WORLD_MAX];
 extern BOOLEAN gubIsCorpseThere[MAX_ALLOWED_WORLD_MAX];
@@ -386,7 +386,7 @@ BOOLEAN									gfDisplayTimerCursor = FALSE;
 UINT32									guiTimerCursorID = 0;
 UINT32									guiTimerLastUpdate = 0;
 UINT32									guiTimerCursorDelay = 0;
-
+UINT8 gRenderDebugInfoMode = DEBUG_OFF;
 
 CHAR16			gzLocation[ 20 ];
 BOOLEAN		gfLocation = FALSE;
@@ -518,6 +518,54 @@ void GetMercOknoDirection( UINT8 ubSoldierID, BOOLEAN *pfGoDown, BOOLEAN *pfGoUp
 }
 //----------------------------------------------------------------------------------
 
+void HandleRenderDebugInfoModes()
+{
+	if (DEBUG_CHEAT_LEVEL())
+	{
+		switch (gRenderDebugInfoMode)
+		{
+		case DEBUG_PATHFINDING:
+			// Nothing to do here, pathfinding info is filled in the pathing functions.
+			break;
+		case DEBUG_THREATVALUE:
+			break;
+		case DEBUG_COVERVALUE:
+			// Calculate cover values for pSoldier under cursor, or for currently selected merc, if nobody is under the cursor.
+			if (gTacticalStatus.Team[OUR_TEAM].bTeamActive)
+			{
+				static SOLDIERTYPE* previousSoldier = nullptr;
+				static INT32 previousLocation = NOWHERE;
+				static UINT8 previousStance = 0;
+
+				UINT16 usSoldierIndex = NOBODY;
+				UINT32 uiMercFlags;
+				FindSoldierFromMouse(&usSoldierIndex, &uiMercFlags);
+				if (usSoldierIndex == NOBODY)
+				{
+					usSoldierIndex = gusSelectedSoldier;
+				}
+
+				if (usSoldierIndex != NOBODY)
+				{
+					// Get Soldier
+					INT32 iPercentBetter;
+					SOLDIERTYPE* pSoldier;
+					GetSoldier(&pSoldier, usSoldierIndex);
+					if (previousSoldier != pSoldier || previousLocation != pSoldier->sGridNo || previousStance != gAnimControl[pSoldier->usAnimState].ubEndHeight)
+					{
+						FindBestNearbyCover(pSoldier, pSoldier->aiData.bAIMorale, &iPercentBetter);
+						previousSoldier = pSoldier;
+						previousLocation = pSoldier->sGridNo;
+						previousStance = gAnimControl[pSoldier->usAnimState].ubEndHeight;
+					}
+				}
+			}
+			break;
+		default: // off
+			break;
+		}
+	}
+}
 
 void PreventFromTheFreezingBug(SOLDIERTYPE* pSoldier)
 {
@@ -691,6 +739,7 @@ UINT32	HandleTacticalUI( void )
 		}
 	}
 
+	HandleRenderDebugInfoModes();
 	// Check if current event has changed and clear event if so, to prepare it for execution
 	// Clearing it does things like set first time flag, param variables, etc
 	if ( uiNewEvent != guiOldEvent )

Tactical/Handle UI.h

@@ -296,6 +296,8 @@ extern BOOLEAN	gfUIForceReExamineCursorData;
 extern INT16	guiCreateGuyIndex;
 extern INT16	guiCreateBadGuyIndex;
 
+extern UINT8 gRenderDebugInfoMode;
+
 // WANNE: Calculate the APs to turn around
 INT16 APsToTurnAround(SOLDIERTYPE *pSoldier, INT32 sAdjustedGridNo);
 
@@ -382,4 +384,4 @@ void GetGridNoScreenXY( INT32 sGridNo, INT16 *pScreenX, INT16 *pScreenY );
 //Legion by Jazz
 void GetMercOknoDirection( UINT8 ubSoldierID, BOOLEAN *pfGoDown, BOOLEAN *pfGoUp );
 
-#endif
+#endif

Tactical/Interface.cpp

@@ -6299,7 +6299,7 @@ BOOLEAN ShowSoldierRoleSymbol(SOLDIERTYPE* pSoldier)
 	if ( pSoldier->usSkillCounter[SOLDIER_COUNTER_ROLE_OBSERVED] >= gGameExternalOptions.usTurnsToUncover )
 	{
 		// are we a VIP? show that only when the player knows a VIP is in this sector. otherwise, don't even show our officer property
-		if ( pSoldier->usSoldierFlagMask & SOLDIER_VIP && !pSoldier->bSectorZ )
+		if (ISVIP(pSoldier) && !pSoldier->bSectorZ )
 		{
 			if ( PlayerKnowsAboutVIP( pSoldier->sSectorX, pSoldier->sSectorY ) )
 			{

Tactical/Overhead.cpp

@@ -3043,7 +3043,7 @@ BOOLEAN HandleAtNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving )
 
 	// sevenfm: check all nearby enemy boxers for opportunity attack
 	if (IS_MERC_BODY_TYPE(pSoldier) &&
-		(pSoldier->flags.uiStatusFlags & SOLDIER_BOXER) &&
+		BOXER(pSoldier) &&
 		gTacticalStatus.bBoxingState == BOXING &&
 		pSoldier->aiData.bAlertStatus >= STATUS_RED)
 	{
@@ -3064,7 +3064,7 @@ BOOLEAN HandleAtNewGridNo( SOLDIERTYPE *pSoldier, BOOLEAN *pfKeepMoving )
 				pOpponent->bCollapsed ||
 				pOpponent->bBreathCollapsed ||
 				!IS_MERC_BODY_TYPE(pOpponent) ||
-				!(pOpponent->flags.uiStatusFlags & SOLDIER_BOXER) ||
+				!BOXER(pOpponent) ||
 				gAnimControl[pOpponent->usAnimState].ubEndHeight < ANIM_STAND ||
 				pOpponent->pathing.bLevel != pSoldier->pathing.bLevel ||
 				!SoldierToSoldierLineOfSightTest(pOpponent, pSoldier, TRUE, CALC_FROM_WANTED_DIR) ||
@@ -7233,7 +7233,7 @@ void RemoveCapturedEnemiesFromSectorInfo( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
 				//if ( pTeamSoldier->stats.bLife >= OKLIFE && pTeamSoldier->stats.bLife != 0 )
 				{
 					// officers and generals are 'special' prisoners...
-					if ( pTeamSoldier->usSoldierFlagMask & SOLDIER_VIP )
+					if (ISVIP(pTeamSoldier))
 						++sNumPrisoner[PRISONER_GENERAL];
 					// downed pilots count as officers too, even though they are civilians. This makes capturing them more rewarding
 					else if ( (pTeamSoldier->usSoldierFlagMask & SOLDIER_ENEMY_OFFICER) || pTeamSoldier->ubCivilianGroup == DOWNEDPILOT_CIV_GROUP )
@@ -7262,7 +7262,7 @@ void RemoveCapturedEnemiesFromSectorInfo( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
 					}
 
 					// Flugente: VIPs
-					if ( pTeamSoldier->usSoldierFlagMask & SOLDIER_VIP )
+					if (ISVIP(pTeamSoldier))
 						DeleteVIP( pTeamSoldier->sSectorX, pTeamSoldier->sSectorY );
 
 					// Flugente: turncoats
@@ -9320,10 +9320,10 @@ BOOLEAN ProcessImplicationsOfPCAttack( SOLDIERTYPE * pSoldier, SOLDIERTYPE ** pp
     if ( gTacticalStatus.bBoxingState == BOXING )
     {
         // should have a check for "in boxing ring", no?
-        if ( ( pSoldier->usAttackingWeapon != NOTHING && !Item[pSoldier->usAttackingWeapon].brassknuckles ) || !( pSoldier->flags.uiStatusFlags & SOLDIER_BOXER ) || pSoldier->IsRiotShieldEquipped() )
+        if ( ( pSoldier->usAttackingWeapon != NOTHING && !Item[pSoldier->usAttackingWeapon].brassknuckles ) || !BOXER(pSoldier) || pSoldier->IsRiotShieldEquipped() )
         {
             // someone's cheating!
-            if ( (Item[ pSoldier->usAttackingWeapon ].usItemClass == IC_BLADE || Item[ pSoldier->usAttackingWeapon ].usItemClass == IC_PUNCH) && (pTarget->flags.uiStatusFlags & SOLDIER_BOXER) )
+            if ( (Item[ pSoldier->usAttackingWeapon ].usItemClass == IC_BLADE || Item[ pSoldier->usAttackingWeapon ].usItemClass == IC_PUNCH) && BOXER(pTarget) )
             {
                 // knife or brass knuckles disqualify the player!
                 BoxingPlayerDisqualified( pSoldier, BAD_ATTACK );
@@ -9334,7 +9334,7 @@ BOOLEAN ProcessImplicationsOfPCAttack( SOLDIERTYPE * pSoldier, SOLDIERTYPE ** pp
                 //gTacticalStatus.bBoxingState = NOT_BOXING;
                 SetBoxingState( NOT_BOXING );
                 // if we are attacking a boxer we should set them to neutral (temporarily) so that the rest of the civgroup code works...
-                if ( (pTarget->bTeam == CIV_TEAM) && (pTarget->flags.uiStatusFlags & SOLDIER_BOXER) )
+                if ( (pTarget->bTeam == CIV_TEAM) && BOXER(pTarget) )
                 {
                     SetSoldierNeutral( pTarget );
                 }
@@ -9481,7 +9481,7 @@ BOOLEAN ProcessImplicationsOfPCAttack( SOLDIERTYPE * pSoldier, SOLDIERTYPE ** pp
                 //TriggerNPCWithIHateYouQuote( pTarget->ubProfile );
             }
         }
-        else if ( pTarget->ubCivilianGroup != NON_CIV_GROUP && !( pTarget->flags.uiStatusFlags & SOLDIER_BOXER ) )
+        else if ( pTarget->ubCivilianGroup != NON_CIV_GROUP && !BOXER(pTarget) )
         {
             // Firing at a civ in a civ group who isn't hostile... if anyone in that civ group can see this
             // going on they should become hostile.
@@ -10927,7 +10927,7 @@ void TurnCoatAttemptMessageBoxCallBack( UINT8 ubExitValue )
 	UINT8 approachchance = MercPtrs[gusSelectedSoldier]->GetTurncoatConvinctionChance( prisonerdialoguetargetID, approachselected );
 
 	// you can never turn a VIP (though we don't tell the player if someone is a VIP, lest they have an exploit to find out)
-	if ( pSoldier->usSoldierFlagMask & SOLDIER_VIP )
+	if (ISVIP(pSoldier))
 		approachchance = 0;
 
 	// as using random numbers to pass the check would result in players savescumming, use a number based on the soldier's stats