From 8ca4f49d61c3d9664eca97d013f6c05beaf45624 Mon Sep 17 00:00:00 2001 From: silversurfer Date: Sat, 11 Apr 2015 15:49:11 +0000 Subject: [PATCH] Fix: OBJECT_KNOWN_TO_BE_TRAPPED was never set on player owned bombs so even the person who armed the bomb didn't know what he did. From now on every trap that we create gets this flag set. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7811 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Items.cpp | 4 ++-- Tactical/Items.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 34c7af02..7e3a0efd 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -13972,8 +13972,8 @@ void BombInventoryDisArmMessageBoxCallBack( UINT8 ubExitValue ) if ( (*gpItemDescObject).fFlags & OBJECT_ARMED_BOMB ) gpItemDescObject->fFlags &= ~( OBJECT_ARMED_BOMB ); - if ( (*gpItemDescObject).fFlags & OBJECT_KNOWN_TO_BE_TRAPPED ) - gpItemDescObject->fFlags &= ~( OBJECT_KNOWN_TO_BE_TRAPPED ); + /*if ( (*gpItemDescObject).fFlags & OBJECT_KNOWN_TO_BE_TRAPPED ) + gpItemDescObject->fFlags &= ~( OBJECT_KNOWN_TO_BE_TRAPPED );*/ } else { diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index d02b36d7..e3c58c35 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -8338,6 +8338,7 @@ BOOLEAN ArmBomb( OBJECTTYPE * pObj, INT8 bSetting ) (*pObj).fFlags &= ~(OBJECT_DISABLED_BOMB); (*pObj).fFlags |= OBJECT_ARMED_BOMB; + (*pObj).fFlags |= OBJECT_KNOWN_TO_BE_TRAPPED; (*pObj)[0]->data.misc.usBombItem = pObj->usItem; return( TRUE ); }