- Fix: delayed explosions not possible in roofs

- Fix: delayed explosions warnings not correctly drawn depending on height level
- improved delayed explosion warning calculations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8382 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-01-29 14:00:18 +00:00
parent bdc46603d8
commit 44577ee164
3 changed files with 32 additions and 12 deletions
+4 -4
View File
@@ -2643,11 +2643,11 @@ void HandleArmedObjectImpact( REAL_OBJECT *pObject )
}
else
{
// Flugente: explosions on the roof do work...
// If we landed on anything other than the floor, always! go off...
if( sZ != 0 ||
pObject->fInWater ||
!fCanDelayExplosion ||
fGoodStatus && !gGameExternalOptions.fDelayedGrenadeExplosion && !fDelayedExplosion )
if ( pObject->fInWater ||
!fCanDelayExplosion ||
fGoodStatus && !gGameExternalOptions.fDelayedGrenadeExplosion && !fDelayedExplosion )
{
fDoImpact = TRUE;
fIsDud = false;