mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
- Bugfix: Fixed a bug that could cause sector items to be identified as bombs altough they weren't (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -450,7 +450,7 @@ INT32 AddItemToWorld( INT32 sGridNo, OBJECTTYPE *pObject, UINT8 ubLevel, UINT16
|
|||||||
|
|
||||||
// Add a bomb reference if needed
|
// Add a bomb reference if needed
|
||||||
// Flugente: we can arm bombs in our inventory and then throw them out, which will cause them to be added to the world. Only way to identify those items is via a check for their bDetonatorType
|
// Flugente: we can arm bombs in our inventory and then throw them out, which will cause them to be added to the world. Only way to identify those items is via a check for their bDetonatorType
|
||||||
if (usFlags & WORLD_ITEM_ARMED_BOMB || ( Item[pObject->usItem].usItemClass & (IC_BOMB) && ( (*pObject)[0]->data.misc.bDetonatorType == BOMB_TIMED ) || ( (*pObject)[0]->data.misc.bDetonatorType == BOMB_REMOTE ) ) )
|
if (usFlags & WORLD_ITEM_ARMED_BOMB || ( (Item[pObject->usItem].usItemClass & (IC_BOMB)) && ( ( (*pObject)[0]->data.misc.bDetonatorType == BOMB_TIMED ) || ( (*pObject)[0]->data.misc.bDetonatorType == BOMB_REMOTE ) ) ) )
|
||||||
{
|
{
|
||||||
iReturn = AddBombToWorld( iItemIndex );
|
iReturn = AddBombToWorld( iItemIndex );
|
||||||
if (iReturn == -1)
|
if (iReturn == -1)
|
||||||
|
|||||||
Reference in New Issue
Block a user