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

Pre-placed bombs (action items with an explosive) can now be blown up by explosives. This allows clearing mine fields with grenades for example.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7745 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2015-02-21 16:33:44 +00:00
parent 045d171bb6
commit caf482614a
1 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+47 -3
View File
@@ -8772,12 +8772,41 @@ BOOLEAN CheckForChainReaction( OBJECTTYPE * pObj , INT16 bStatus, INT16 bDamage,
return( FALSE );
}
BOOLEAN DamageItem( OBJECTTYPE * pObject, INT32 iDamage, BOOLEAN fOnGround )
// this checks specifically for action items which are just the trigger for the real item, for example a mine
BOOLEAN CheckForChainReactionActionItem( OBJECTTYPE * pObj, INT16 bDamage)
{
INT32 iChance;
UINT16 usItem;
// we shouldn't be here
if(pObj == NULL || !( pObj->usItem == ACTION_ITEM && Item[ (*pObj)[0]->data.misc.usBombItem ].usItemClass & IC_EXPLOSV ) )
return FALSE;
usItem = (*pObj)[0]->data.misc.usBombItem;
iChance = Explosive[Item[usItem].ubClassIndex].ubVolatility;
if (iChance > 0)
{
// Scale the base chance by the damage caused to the item
// (bigger the shock, bigger chance) and the condition of
// the item after being hit!
iChance = 50 + (iChance - 1) * 10;
iChance = iChance * ( 100 + ( (100 - (*pObj)[0]->data.objectStatus) + bDamage ) / 2 ) / 100;
if ((INT32) PreRandom( 100 ) < iChance)
{
return( TRUE );
}
}
return( FALSE );
}
BOOLEAN DamageItem( OBJECTTYPE * pObject, INT32 iDamage, BOOLEAN fOnGround, INT32 sGridNo = -1, INT8 bLevel = 0 )
{
INT8 bLoop;
INT16 bDamage;
if ( (Item[pObject->usItem].damageable || Item[ pObject->usItem ].usItemClass == IC_AMMO) && pObject->exists() == true)
if ( pObject->exists() && (Item[pObject->usItem].damageable || Item[ pObject->usItem ].usItemClass == IC_AMMO) )
{
for (bLoop = 0; bLoop < pObject->ubNumberOfObjects; bLoop++)
@@ -8862,6 +8891,21 @@ BOOLEAN DamageItem( OBJECTTYPE * pObject, INT32 iDamage, BOOLEAN fOnGround )
}
}
}
// silversurfer: Action item bombs can now be blown up as well. Happy mine field clearing! ;)
else if ( pObject->exists() && ( pObject->usItem == ACTION_ITEM && (*pObject)[0]->data.misc.bActionValue == ACTION_ITEM_BLOW_UP ))
{
bDamage = CheckItemForDamage( (*pObject)[0]->data.misc.usBombItem, iDamage );
if ( CheckForChainReactionActionItem( pObject, bDamage) )
{
UINT32 uiTimeStamp= GetJA2Clock();
for (UINT32 uiWorldBombIndex = 0; uiWorldBombIndex < guiNumWorldBombs; uiWorldBombIndex++)
{
if ( gWorldBombs[uiWorldBombIndex].fExists && gWorldItems[ gWorldBombs[uiWorldBombIndex].iItemIndex ].sGridNo == sGridNo && gWorldItems[ gWorldBombs[uiWorldBombIndex].iItemIndex ].ubLevel == bLevel )
AddBombToQueue( uiWorldBombIndex, uiTimeStamp );
}
}
}
return( FALSE );
}
@@ -8954,7 +8998,7 @@ BOOLEAN DamageItemOnGround( OBJECTTYPE * pObject, INT32 sGridNo, INT8 bLevel, IN
BOOLEAN fBlowsUp;
fBlowsUp = DamageItem( pObject, iDamage, TRUE );
fBlowsUp = DamageItem( pObject, iDamage, TRUE, sGridNo, bLevel );
if ( fBlowsUp )
{
// OK, Ignite this explosion!