From 039b9211b72868fd86fec625dee6351524b1ff27 Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 19 Jun 2006 16:09:47 +0000
Subject: [PATCH] -got rid of redundant gas mask checks

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@265 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 TacticalAI/AIUtils.cpp       |  2 +-
 TacticalAI/FindLocations.cpp | 36 ------------------------------------
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/TacticalAI/AIUtils.cpp b/TacticalAI/AIUtils.cpp
index b67863ee..667cc156 100644
--- a/TacticalAI/AIUtils.cpp
+++ b/TacticalAI/AIUtils.cpp
@@ -1778,7 +1778,7 @@ BOOLEAN WearGasMaskIfAvailable( SOLDIERTYPE * pSoldier )
 {
 	INT8		bSlot, bNewSlot;
 
-	bSlot = FindObj( pSoldier, GASMASK );
+	bSlot = FindGasMask( pSoldier );
 	if ( bSlot == NO_SLOT )
 	{
 		return( FALSE );
diff --git a/TacticalAI/FindLocations.cpp b/TacticalAI/FindLocations.cpp
index e9ea1285..b033bcac 100644
--- a/TacticalAI/FindLocations.cpp
+++ b/TacticalAI/FindLocations.cpp
@@ -548,24 +548,12 @@ INT16 FindBestNearbyCover(SOLDIERTYPE *pSoldier, INT32 morale, INT32 *piPercentB
 	INT8 *		pbPublOL;
 	SOLDIERTYPE *pOpponent;
 	UINT16 usMovementMode;
-	INT8	fHasGasMask;
 
 	UINT8	ubBackgroundLightLevel;
 	UINT8	ubBackgroundLightPercent = 0;
 	UINT8	ubLightPercentDifference;
 	BOOLEAN		fNight;
 
-	switch( FindObj( pSoldier, GASMASK ) )
-	{
-		case HEAD1POS:
-		case HEAD2POS:
-			fHasGasMask = TRUE;
-			break;
-		default:
-			fHasGasMask = FALSE;
-			break;
-	}
-
 	if ( gbWorldSectorZ > 0 )
 	{
 		fNight = FALSE;
@@ -1116,19 +1104,6 @@ INT16 FindSpotMaxDistFromOpponents(SOLDIERTYPE *pSoldier)
 	INT16	sOrigin;
 	INT32	iRoamRange;
 
-	INT8	fHasGasMask;
-	
-	switch( FindObj( pSoldier, GASMASK ) )
-	{
-		case HEAD1POS:
-		case HEAD2POS:
-			fHasGasMask = TRUE;
-			break;
-		default:
-			fHasGasMask = FALSE;
-			break;
-	}
-
 	// BUILD A LIST OF THREATENING GRID #s FROM PERSONAL & PUBLIC opplistS
 
 	// look through all opponents for those we know of
@@ -2375,18 +2350,7 @@ INT16 FindFlankingSpot(SOLDIERTYPE *pSoldier, INT16 sPos, INT8 bAction )
 	INT32 iSearchRange = 4;
 	INT16	sMaxLeft, sMaxRight, sMaxUp, sMaxDown, sXOffset, sYOffset;
 
-	INT8	fHasGasMask;
 	DebugMsg ( TOPIC_JA2AI , DBG_LEVEL_3 , String("FindFlankingSpot: orig loc = %d, loc to flank = %d", pSoldier->sGridNo , sPos));
-	switch( FindObj( pSoldier, GASMASK ) )
-	{
-		case HEAD1POS:
-		case HEAD2POS:
-			fHasGasMask = TRUE;
-			break;
-		default:
-			fHasGasMask = FALSE;
-			break;
-	}
 
 	// hit the edge of the map
 	if ( FindNearestEdgePoint ( pSoldier->sGridNo ) == pSoldier->sGridNo  )