1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- roofs can also collapse if walla are destroyed with anti-materiel rifles

Browse Source 
- Fix: roofs at the centre of an explosion always collapsed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7618 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-10-27 22:36:52 +00:00
parent c47ad1214e
commit 4e1c24c2d0
2 changed files with 81 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/Explosion Control.cpp
+64 -18
View File
@@ -2348,22 +2348,26 @@ BOOLEAN ExpAffect( INT32 sBombGridNo, INT32 sGridNo, UINT32 uiDist, UINT16 usIte
sStructDmgAmt = sWoundAmt;
}
// Flugente: walls are attributed to a gridno. As a result, sometimes the outer wall of a house is located at a gridno that does not 'belong' to the house.
// This gridno will then have no roof over it, which HandleRoofDestruction(..) requires.
// For this reason, we call it also at neighbouring gridnos.
// If the explosion, however, is on a roof itself, no need for these shenanigans.
if ( bLevel )
{
HandleRoofDestruction( sGridNo, sWoundAmt );
}
// Flugente: roof collapse
// Only do this at the source of the explosion (uiDist == 0).
else if ( !uiDist )
if ( !uiDist )
{
HandleRoofDestruction( sGridNo, sWoundAmt * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( NORTH )), sWoundAmt * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( EAST )), sWoundAmt * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( WEST )), sWoundAmt * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( SOUTH )), sWoundAmt * 0.75f );
// walls are attributed to a gridno. As a result, sometimes the outer wall of a house is located at a gridno that does not 'belong' to the house.
// This gridno will then have no roof over it, which HandleRoofDestruction(..) requires.
// For this reason, we call it also at neighbouring gridnos.
// If the explosion, however, is on a roof itself, no need for these shenanigans.
if ( bLevel )
{
HandleRoofDestruction( sGridNo, sWoundAmt );
}
else
{
HandleRoofDestruction( sGridNo, sWoundAmt * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( NORTH )), sWoundAmt * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( EAST )), sWoundAmt * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( WEST )), sWoundAmt * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( SOUTH )), sWoundAmt * 0.75f );
}
}
ExplosiveDamageGridNo( sGridNo, sStructDmgAmt, uiDist, &fRecompileMovementCosts, FALSE, -1, 0 , ubOwner, bLevel );
@@ -5941,6 +5945,44 @@ void RoofDestruction( INT32 sGridNo )
RemoveAllRoofsOfTypeRangeAdjustSaveFile( sGridNo, FIRSTTEXTURE, WIREFRAMES );
}
// damage, or even destroy, a roof tile
// return true if it roof was destroyed
BOOLEAN DamageRoof( INT32 sGridNo, INT16 sDamage )
{
// only if there is significant damage done
if ( sDamage < 1 || TileIsOutOfBounds( sGridNo ) || !IsRoofPresentAtGridNo( sGridNo ) )
return FALSE;
// sadly, pStruct->ubHitPoints of roof structures is shadowed by sBaseGridNo, so we cannot use it
// pStruct->pDBStructureRef->pDBStructure->ubHitPoints is always 0 for roof tiles, so we cannot use that either
// therefore roofs have no HP pool, and we have to outright destroy them
// should that ever be corrected, comment this part back in
// I could jut write something into pStruct->pDBStructureRef->pDBStructure->ubHitPoints, but knowing the code the 0 will also be used somewhere else - if you try that, be careful!
/*STRUCTURE* pStruct = FindStructure( sGridNo, STRUCTURE_ROOF );
if ( pStruct )
{
// if damage exceeds hitpoints, destroy the thing
if ( (UINT8)sDamage >= pStruct->pDBStructureRef->pDBStructure->ubHitPoints )
{
RoofDestruction( sGridNo );
return TRUE;
}
// otherwise just damage it
else
{
pStruct->pDBStructureRef->pDBStructure->ubHitPoints = (UINT8)max( 1, pStruct->ubHitPoints - sDamage );
}
}
return FALSE;*/
// just destroy the thing
RoofDestruction( sGridNo );
return TRUE;
}
void HandleRoofDestruction( INT32 sGridNo, INT16 sDamage )
{
// only if there is significant damage done
@@ -5962,13 +6004,16 @@ void HandleRoofDestruction( INT32 sGridNo, INT16 sDamage )
INT16 distance = PythSpacesAway( sGridNo, sNewGridno );
// for formula reasons, distance is at least 1
distance = max( distance, 1);
// only remove tile if enough damage has been done
// it might be necessary to tweak the damage formula here
// armour above 127 is deemed indestructable
if ( bestarmour < 127 && sDamage > distance * bestarmour )
{
RoofDestruction( sNewGridno );
(*it).second = 0;
if ( DamageRoof( sNewGridno, sDamage - distance * bestarmour ) )
(*it).second = 0;
}
}
@@ -5998,7 +6043,7 @@ void HandleRoofDestruction( INT32 sGridNo, INT16 sDamage )
if ( pair.second < 1 )
{
RoofDestruction( pair.first );
if ( DamageRoof( pair.first, 255 ) )
pair.second = 0;
}
}*/
@@ -6015,7 +6060,8 @@ void HandleRoofDestruction( INT32 sGridNo, INT16 sDamage )
{
for ( gridnoarmourvector::iterator it = roofnetwork.begin( ); it != roofnetwork.end( ); ++it )
{
RoofDestruction( (*it).first );
if ( DamageRoof( (*it).first, 255 ) )
(*it).second = 0;
}
}
}
TileEngine/structure.cpp
+17 -1
View File
@@ -1789,7 +1789,7 @@ BOOLEAN DamageStructure( STRUCTURE * pStructure, UINT8 ubDamage, UINT8 ubReason,
// don't hurt this structure, it's used for hit detection only!
return( FALSE );
}
if ( (pStructure->pDBStructureRef->pDBStructure->ubArmour == MATERIAL_INDESTRUCTABLE_METAL) || (pStructure->pDBStructureRef->pDBStructure->ubArmour == MATERIAL_INDESTRUCTABLE_STONE) )
{
return( FALSE );
@@ -1825,6 +1825,11 @@ BOOLEAN DamageStructure( STRUCTURE * pStructure, UINT8 ubDamage, UINT8 ubReason,
ubDamage = 0;
}
// Flugente: is there a wall at the loation we are damaging?
BOOLEAN fWallHere = FALSE;
if ( FindStructure( sGridNo, STRUCTURE_WALL ) )
fWallHere = TRUE;
// OK, Let's check our reason
if ( ubReason == STRUCTURE_DAMAGE_GUNFIRE || ubReason == STRUCTURE_DAMAGE_VEHICLE_TRAUMA )
{
@@ -1883,6 +1888,17 @@ BOOLEAN DamageStructure( STRUCTURE * pStructure, UINT8 ubDamage, UINT8 ubReason,
//Since the structure is being damaged, set the map element that a structure is damaged
gpWorldLevelData[ sGridNo ].uiFlags |= MAPELEMENT_STRUCTURE_DAMAGED;
// if we destroyed something, the roof might get damaged too
// recompile = TRUE means that we destroyed soemthing
if ( fWallHere && recompile )
{
HandleRoofDestruction( sGridNo, damage * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( NORTH ) ), damage * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( EAST ) ), damage * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( WEST ) ), damage * 0.75f );
HandleRoofDestruction( NewGridNo( sGridNo, DirectionInc( SOUTH ) ), damage * 0.75f );
}
}
// anv: if we ram something with vehicle we have to destroy it, or else vehicle and structure will be drawn at the same tile