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

If DELAYED_GRENADE_EXPLOSION = TRUE in JA2_Options.ini, toggling fire modes on a grenade launcher toggles whether the grenades explode on impact or with a 1-turn delay.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8653 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2019-01-27 23:53:11 +00:00
parent a5e5ff6bd8
commit e7f098c2f2
14 changed files with 74 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/physics.cpp
+11 -10
View File
@@ -2596,17 +2596,18 @@ 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 ( pObject->fInWater ||
!fCanDelayExplosion ||
fGoodStatus && !gGameExternalOptions.fDelayedGrenadeExplosion && !fDelayedExplosion )
{
fDoImpact = TRUE;
fIsDud = false;
}
else // didn't go off!
fDoImpact = TRUE;
fIsDud = false;
// Flugente: explosion does not happen instantly if grenade
// is not in water and
// either has a bad status or is a delayed grenade
if ( !pObject->fInWater &&
( !fGoodStatus ||
( fCanDelayExplosion && gGameExternalOptions.fDelayedGrenadeExplosion && fDelayedExplosion) ) )
{
// didn't go off!
fDoImpact = FALSE;
fIsDud = true;
}
}