- Bugfixes for Additional Tile Properties and Lightning Feature (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7122 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-03-28 19:59:38 +00:00
parent 3341992db4
commit aa1fa49903
2 changed files with 13 additions and 6 deletions
+7 -3
View File
@@ -525,6 +525,11 @@ ADDITIONAL_TILE_PROPERTIES_VALUES GetAllAdditonalTilePropertiesForGrid( const IN
BOOLEAN fFoundBottom = FALSE;
memset(&ubAllTileProperties,0,sizeof(ubAllTileProperties));
if( !( sGridNo > -1 && sGridNo < WORLD_MAX ) || !( bLevel == FIRST_LEVEL || bLevel == SECOND_LEVEL ) )
{
// incorrect argument values, what the hell?
return ubAllTileProperties;
}
for(UINT8 ubCnt=0; ubCnt<5 && !fFoundBottom; ubCnt++)
{
if (bLevel == I_ROOF_LEVEL)
@@ -566,11 +571,10 @@ ADDITIONAL_TILE_PROPERTIES_VALUES GetAllAdditonalTilePropertiesForGrid( const IN
break;
}
}
if( pNode!= NULL )
if( pNode!= NULL && pNode->usIndex < NUMBEROFTILES )
{
iWoodCamoAffinity += gTileDatabase[ pNode->usIndex ].bWoodCamoAffinity;
iDesertCamoAffinity += gTileDatabase[ pNode->usIndex ].bDesertCamoAffinity;
iUrbanCamoAffinity += gTileDatabase[ pNode->usIndex ].bUrbanCamoAffinity;
iDesertCamoAffinity += gTileDatabase[ pNode->usIndex ].bDesertCamoAffinity; iUrbanCamoAffinity += gTileDatabase[ pNode->usIndex ].bUrbanCamoAffinity;
iSnowCamoAffinity += gTileDatabase[ pNode->usIndex ].bSnowCamoAffinity;
iCamoStanceModifer += gTileDatabase[ pNode->usIndex ].bCamoStanceModifer;