Fixed problems with enemy rooftop climbing (by sevenfm)

- Also updated "Water", "DeepWater" and "WaterTooDeepForAttacks" methods: Added bLevel parameter (by sevenfm)
- see: http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22966&start=0&

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8110 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2016-03-15 12:40:54 +00:00
parent 5bc2bae07e
commit 23d4051473
12 changed files with 118 additions and 154 deletions
+17 -5
View File
@@ -3717,15 +3717,21 @@ UINT8 GetTerrainType( INT32 sGridNo )
*/
}
BOOLEAN Water( INT32 sGridNo )
BOOLEAN Water( INT32 sGridNo, BOOLEAN bLevel )
{
MAP_ELEMENT * pMapElement;
if( TileIsOutOfBounds( sGridNo ) )
{
return( FALSE );
}
// sevenfm: check bridge
if( bLevel )
{
return FALSE;
}
pMapElement = &(gpWorldLevelData[sGridNo]);
if ( TERRAIN_IS_WATER( pMapElement->ubTerrainID) )
{
@@ -3738,7 +3744,7 @@ BOOLEAN Water( INT32 sGridNo )
}
}
BOOLEAN DeepWater( INT32 sGridNo )
BOOLEAN DeepWater( INT32 sGridNo, BOOLEAN bLevel )
{
MAP_ELEMENT * pMapElement;
@@ -3747,6 +3753,12 @@ BOOLEAN DeepWater( INT32 sGridNo )
return( FALSE );
}
// sevenfm: check bridge
if( bLevel )
{
return FALSE;
}
pMapElement = &(gpWorldLevelData[sGridNo]);
if (TERRAIN_IS_DEEP_WATER( pMapElement->ubTerrainID) )
@@ -3760,9 +3772,9 @@ BOOLEAN DeepWater( INT32 sGridNo )
}
}
BOOLEAN WaterTooDeepForAttacks( INT32 sGridNo )
BOOLEAN WaterTooDeepForAttacks( INT32 sGridNo, BOOLEAN bLevel )
{
return( DeepWater( sGridNo ) );
return( DeepWater( sGridNo, bLevel ) );
}
void SetStructAframeFlags( INT32 iMapIndex, UINT32 uiFlags )