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

Anti-materiel bullets are no longer stopped when they apply damage to a structure, thus restoring piercing ability for them.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9114 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2021-06-27 15:32:02 +00:00
parent 89e2bd077a
commit 3740d8b7c4
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/LOS.cpp
+11 -11
View File
@@ -7553,6 +7553,15 @@ void MoveBullet( INT32 iBullet )
} }
} }
// Flugente: required check as it's possible anti-materiel bullets will destroy a structure mid-flight
if ( !pStructure->pShape )
{
// Moved here to keep ABC >0 as long as possible
RemoveBullet( iBullet );
// ReduceAttackBusyCount( );
return;
}
if (((*(pStructure->pShape))[pBullet->bLOSIndexX][pBullet->bLOSIndexY] & AtHeight[iCurrCubesAboveLevelZ]) > 0) if (((*(pStructure->pShape))[pBullet->bLOSIndexX][pBullet->bLOSIndexY] & AtHeight[iCurrCubesAboveLevelZ]) > 0)
{ {
if (pStructure->fFlags & STRUCTURE_PERSON) if (pStructure->fFlags & STRUCTURE_PERSON)
@@ -7728,16 +7737,6 @@ void MoveBullet( INT32 iBullet )
// play animation to indicate structure being hit // play animation to indicate structure being hit
BulletHitStructure( pBullet, pStructure->usStructureID, 1, pBullet->qCurrX, pBullet->qCurrY, pBullet->qCurrZ, FALSE ); BulletHitStructure( pBullet, pStructure->usStructureID, 1, pBullet->qCurrX, pBullet->qCurrY, pBullet->qCurrZ, FALSE );
gubLocalStructureNumTimesHit[iStructureLoop] = 1; gubLocalStructureNumTimesHit[iStructureLoop] = 1;
// Flugente: anti-materiel rifles have to be handled slightly different - we have to remove the bullet after impact.
// Otherwise we might destroy a structure, but this function won't 'realize' it, leading to invalid memory access
if ( pBullet->usFlags & BULLET_FLAG_ANTIMATERIEL )
{
// Moved here to keep ABC >0 as long as possible
RemoveBullet( iBullet );
// ReduceAttackBusyCount( );
return;
}
} }
} }
} }
@@ -7746,7 +7745,8 @@ void MoveBullet( INT32 iBullet )
// Flugente: a riot shield would cover the entire front of a tile. We thus cannot check whether the person would be hit, as the bullet might miss a soldier // Flugente: a riot shield would cover the entire front of a tile. We thus cannot check whether the person would be hit, as the bullet might miss a soldier
// Instead, we check whether the structure is indeed a person, whether that person has a riot shield equipped, and whether that shield faces the bullet before it would hit the soldier // Instead, we check whether the structure is indeed a person, whether that person has a riot shield equipped, and whether that shield faces the bullet before it would hit the soldier
if ( lastriotshieldholder != pStructure->usStructureID if ( pStructure
&& lastriotshieldholder != pStructure->usStructureID
&& pStructure->fFlags & STRUCTURE_PERSON && pStructure->fFlags & STRUCTURE_PERSON
&& pStructure->usStructureID < TOTAL_SOLDIERS ) && pStructure->usStructureID < TOTAL_SOLDIERS )
{ {