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

-got rid of redundant gas mask checks

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@265 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-06-19 16:09:47 +00:00
parent 60696b4c68
commit 039b9211b7
2 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TacticalAI/AIUtils.cpp
+1 -1
View File
@@ -1778,7 +1778,7 @@ BOOLEAN WearGasMaskIfAvailable( SOLDIERTYPE * pSoldier )
{ {
INT8 bSlot, bNewSlot; INT8 bSlot, bNewSlot;
bSlot = FindObj( pSoldier, GASMASK ); bSlot = FindGasMask( pSoldier );
if ( bSlot == NO_SLOT ) if ( bSlot == NO_SLOT )
{ {
return( FALSE ); return( FALSE );
TacticalAI/FindLocations.cpp
-36
View File
@@ -548,24 +548,12 @@ INT16 FindBestNearbyCover(SOLDIERTYPE *pSoldier, INT32 morale, INT32 *piPercentB
INT8 * pbPublOL; INT8 * pbPublOL;
SOLDIERTYPE *pOpponent; SOLDIERTYPE *pOpponent;
UINT16 usMovementMode; UINT16 usMovementMode;
INT8 fHasGasMask;
UINT8 ubBackgroundLightLevel; UINT8 ubBackgroundLightLevel;
UINT8 ubBackgroundLightPercent = 0; UINT8 ubBackgroundLightPercent = 0;
UINT8 ubLightPercentDifference; UINT8 ubLightPercentDifference;
BOOLEAN fNight; BOOLEAN fNight;
switch( FindObj( pSoldier, GASMASK ) )
{
case HEAD1POS:
case HEAD2POS:
fHasGasMask = TRUE;
break;
default:
fHasGasMask = FALSE;
break;
}
if ( gbWorldSectorZ > 0 ) if ( gbWorldSectorZ > 0 )
{ {
fNight = FALSE; fNight = FALSE;
@@ -1116,19 +1104,6 @@ INT16 FindSpotMaxDistFromOpponents(SOLDIERTYPE *pSoldier)
INT16 sOrigin; INT16 sOrigin;
INT32 iRoamRange; 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 // BUILD A LIST OF THREATENING GRID #s FROM PERSONAL & PUBLIC opplistS
// look through all opponents for those we know of // look through all opponents for those we know of
@@ -2375,18 +2350,7 @@ INT16 FindFlankingSpot(SOLDIERTYPE *pSoldier, INT16 sPos, INT8 bAction )
INT32 iSearchRange = 4; INT32 iSearchRange = 4;
INT16 sMaxLeft, sMaxRight, sMaxUp, sMaxDown, sXOffset, sYOffset; 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)); 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 // hit the edge of the map
if ( FindNearestEdgePoint ( pSoldier->sGridNo ) == pSoldier->sGridNo ) if ( FindNearestEdgePoint ( pSoldier->sGridNo ) == pSoldier->sGridNo )