1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes (by Sevenfm)

Browse Source 
- 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
This commit is contained in:
Wanne
2013-11-22 21:56:06 +00:00
parent ba5edad40c
commit bec015359a
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/DisplayCover.cpp
+1 -1
View File
@@ -1007,7 +1007,7 @@ void CalculateMines()
BOOLEAN fWithMineDetector = FALSE; BOOLEAN fWithMineDetector = FALSE;
if ( pSoldier && gubDrawModeMine == MINES_DRAW_DETECT_ENEMY ) if ( pSoldier && gubDrawModeMine == MINES_DRAW_DETECT_ENEMY )
{ {
if ( FindMetalDetectorInHand(pSoldier) ) if ( FindMetalDetectorInHand(pSoldier) != NO_SLOT )
fWithMineDetector = TRUE; fWithMineDetector = TRUE;
// TODO: perhaps even consume batteries one day... // TODO: perhaps even consume batteries one day...
Tactical/Items.cpp
+5 -2
View File
@@ -8018,11 +8018,14 @@ BOOLEAN ArmBomb( OBJECTTYPE * pObj, INT8 bSetting )
else else
ubWireNetworkFlag |= TRIPWIRE_NETWORK_NET_4; ubWireNetworkFlag |= TRIPWIRE_NETWORK_NET_4;
// sevenfm: fixed incorrect hierarchy calculation
if(netnr == 0)
hierarchytimesfour -= 4;
if ( 0 == hierarchytimesfour ) if ( 0 == hierarchytimesfour )
ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_1; ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_1;
else if ( 1 == hierarchytimesfour ) else if ( 4 == hierarchytimesfour )
ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_2; ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_2;
else if ( 2 == hierarchytimesfour ) else if ( 8 == hierarchytimesfour )
ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_3; ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_3;
else else
ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_4; ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_4;