From bec015359a07c735d81c9a46c2d983da0e005b91 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 22 Nov 2013 21:56:06 +0000 Subject: [PATCH] Fixes (by Sevenfm) - Fixed small bug : SHIFT+ALT+C always showed enemy mines, even without metal detector. - Fixed: incorrect tripwire hierarchy calculation. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6641 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/DisplayCover.cpp | 2 +- Tactical/Items.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Tactical/DisplayCover.cpp b/Tactical/DisplayCover.cpp index 44545a16..2c075f9c 100644 --- a/Tactical/DisplayCover.cpp +++ b/Tactical/DisplayCover.cpp @@ -1007,7 +1007,7 @@ void CalculateMines() BOOLEAN fWithMineDetector = FALSE; if ( pSoldier && gubDrawModeMine == MINES_DRAW_DETECT_ENEMY ) { - if ( FindMetalDetectorInHand(pSoldier) ) + if ( FindMetalDetectorInHand(pSoldier) != NO_SLOT ) fWithMineDetector = TRUE; // TODO: perhaps even consume batteries one day... diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 132d93c6..aef1fb9a 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -8018,11 +8018,14 @@ BOOLEAN ArmBomb( OBJECTTYPE * pObj, INT8 bSetting ) else ubWireNetworkFlag |= TRIPWIRE_NETWORK_NET_4; + // sevenfm: fixed incorrect hierarchy calculation + if(netnr == 0) + hierarchytimesfour -= 4; if ( 0 == hierarchytimesfour ) ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_1; - else if ( 1 == hierarchytimesfour ) + else if ( 4 == hierarchytimesfour ) ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_2; - else if ( 2 == hierarchytimesfour ) + else if ( 8 == hierarchytimesfour ) ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_3; else ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_4;