- tooltips on the enemy are only displayed if the enemy can be seen by the selected merc. This only takes effect if tooltip detail level = 1 (limited) or 2 (basic)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@624 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Tactical/Interface Items.cpp

@@ -7004,7 +7004,7 @@ void ItemPickupCancel( GUI_BUTTON *btn, INT32 reason )
 void ItemPickMenuMouseMoveCallback( MOUSE_REGION * pRegion, INT32 iReason )
 {
 	UINT32					uiItemPos;
-	ITEM_POOL				*pTempItemPool;
+	//ITEM_POOL				*pTempItemPool;
 	INT32						bPos;
 	static					BOOLEAN	bChecked = FALSE;
 

Tactical/SoldierTooltips.cpp

@@ -75,7 +75,7 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 
 				if ( !(Item[MercPtrs[gusSelectedSoldier]->inv[HEAD1POS].usItem].nightvisionrangebonus > 0) &&
 					 !(Item[MercPtrs[gusSelectedSoldier]->inv[HEAD2POS].usItem].nightvisionrangebonus > 0) &&
-					 !DayTime() )
+ 					 !DayTime() )
 				{
 					// if night reduce max tooltip viewing distance by a factor of 4 if merc is not wearing NVG
 					uiMaxTooltipDistance >>= 2;
@@ -100,6 +100,20 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 			} // fMercIsUsingScope is false
 		} // gGameExternalOptions.fEnableDynamicSoldierTooltips
 
+
+		// WANNE: Check if enemy soldier is in line of sight only if player has not chosen full or debug details
+		if ( ubTooltipDetailLevel < DL_Full)
+		{
+			// Get the current selected merc
+			SOLDIERTYPE* pMerc = MercPtrs[ gusSelectedSoldier ];
+			
+			if (ManLooksForMan(pMerc, pSoldier, 1) == FALSE)
+			{
+				// We do not see the enemy. Return and do not display the tooltip.
+				return;
+			}
+		}
+
 		swprintf( pStrInfo, L"" );
 		if ( ubTooltipDetailLevel == DL_Debug )
 		{

Utils/_DutchText.cpp

@@ -4141,8 +4141,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Leggings: %s\n",
 	// Limited, Basic
 	L"|Armor: ",
-	L"Helmet",
+	L"Helmet ",
-	L"Vest",
+	L"Vest ",
 	L"Leggings",
 	L"worn",
 	L"no Armor",

Utils/_EnglishText.cpp

@@ -4144,8 +4144,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Leggings: %s\n",
 	// Limited, Basic
 	L"|Armor: ",
-	L"Helmet",
+	L"Helmet ",
-	L"Vest",
+	L"Vest ",
 	L"Leggings",
 	L"worn",
 	L"no Armor",

Utils/_FrenchText.cpp

@@ -4123,8 +4123,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Leggings: %s\n",
 	// Limited, Basic
 	L"|Armor: ",
-	L"Helmet",
+	L"Helmet ",
-	L"Vest",
+	L"Vest ",
 	L"Leggings",
 	L"worn",
 	L"no Armor",

Utils/_GermanText.cpp

@@ -3935,8 +3935,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Hose: %s\n",
 	// Limited, Basic
 	L"|Rüstung: ",
-	L"Helm",
+	L"Helm ",
-	L"Weste",
+	L"Weste ",
 	L"Hose",
 	L"getragen",
 	L"keine Rüstung",

Utils/_ItalianText.cpp

@@ -4119,8 +4119,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Leggings: %s\n",
 	// Limited, Basic
 	L"|Armor: ",
-	L"Helmet",
+	L"Helmet ",
-	L"Vest",
+	L"Vest ",
 	L"Leggings",
 	L"worn",
 	L"no Armor",

Utils/_PolishText.cpp

@@ -4112,8 +4112,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Leggings: %s\n",
 	// Limited, Basic
 	L"|Armor: ",
-	L"Helmet",
+	L"Helmet ",
-	L"Vest",
+	L"Vest ",
 	L"Leggings",
 	L"worn",
 	L"no Armor",

Utils/_RussianText.cpp

@@ -4133,8 +4133,8 @@ STR16 gzTooltipStrings[] =
 	L"%s|Leggings: %s\n",
 	// Limited, Basic
 	L"|Armor: ",
-	L"Helmet",
+	L"Helmet ",
-	L"Vest",
+	L"Vest ",
 	L"Leggings",
 	L"worn",
 	L"no Armor",