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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/LOS.cpp
+7 -3
View File
@@ -525,6 +525,11 @@ ADDITIONAL_TILE_PROPERTIES_VALUES GetAllAdditonalTilePropertiesForGrid( const IN
BOOLEAN fFoundBottom = FALSE; BOOLEAN fFoundBottom = FALSE;
memset(&ubAllTileProperties,0,sizeof(ubAllTileProperties)); 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++) for(UINT8 ubCnt=0; ubCnt<5 && !fFoundBottom; ubCnt++)
{ {
if (bLevel == I_ROOF_LEVEL) if (bLevel == I_ROOF_LEVEL)
@@ -566,11 +571,10 @@ ADDITIONAL_TILE_PROPERTIES_VALUES GetAllAdditonalTilePropertiesForGrid( const IN
break; break;
} }
} }
if( pNode!= NULL ) if( pNode!= NULL && pNode->usIndex < NUMBEROFTILES )
{ {
iWoodCamoAffinity += gTileDatabase[ pNode->usIndex ].bWoodCamoAffinity; iWoodCamoAffinity += gTileDatabase[ pNode->usIndex ].bWoodCamoAffinity;
iDesertCamoAffinity += gTileDatabase[ pNode->usIndex ].bDesertCamoAffinity; iDesertCamoAffinity += gTileDatabase[ pNode->usIndex ].bDesertCamoAffinity; iUrbanCamoAffinity += gTileDatabase[ pNode->usIndex ].bUrbanCamoAffinity;
iUrbanCamoAffinity += gTileDatabase[ pNode->usIndex ].bUrbanCamoAffinity;
iSnowCamoAffinity += gTileDatabase[ pNode->usIndex ].bSnowCamoAffinity; iSnowCamoAffinity += gTileDatabase[ pNode->usIndex ].bSnowCamoAffinity;
iCamoStanceModifer += gTileDatabase[ pNode->usIndex ].bCamoStanceModifer; iCamoStanceModifer += gTileDatabase[ pNode->usIndex ].bCamoStanceModifer;
TileEngine/lighting.cpp
+6 -3
View File
@@ -762,11 +762,14 @@ UINT8 LightTrueLevel( INT32 sGridNo, INT16 bLevel )
{ {
LEVELNODE* pShadowNode = NULL; LEVELNODE* pShadowNode = NULL;
if(!(pStructure->fFlags & STRUCTURE_BASE_TILE)) if(!(pStructure->fFlags & STRUCTURE_BASE_TILE))
pShadowNode = gpWorldLevelData[ FindBaseStructure(pStructure)->sGridNo ].pShadowHead; {
STRUCTURE* pBaseStructure = FindBaseStructure(pStructure);
if( pBaseStructure != NULL )
pShadowNode = gpWorldLevelData[ pBaseStructure->sGridNo ].pShadowHead;
}
else else
pShadowNode = gpWorldLevelData[ sNewGridNo ].pShadowHead; pShadowNode = gpWorldLevelData[ sNewGridNo ].pShadowHead;
if(pShadowNode != NULL) if(pShadowNode != NULL) {
{
iSum += max( 0, (StructureHeight(pStructure) - 1 ) ); iSum += max( 0, (StructureHeight(pStructure) - 1 ) );
} }
} }