diff --git a/JA2.suo b/JA2.suo index e3b58049..6753e143 100644 Binary files a/JA2.suo and b/JA2.suo differ diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index f59ae822..3fdc720d 100644 --- a/Tactical/Interface Items.cpp +++ b/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; diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index be8fe5ee..7089b43c 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/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 ) { diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 90c296cb..cba69a5b 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -4141,8 +4141,8 @@ STR16 gzTooltipStrings[] = L"%s|Leggings: %s\n", // Limited, Basic L"|Armor: ", - L"Helmet", - L"Vest", + L"Helmet ", + L"Vest ", L"Leggings", L"worn", L"no Armor", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index a3bf280a..7687ffd4 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -4144,8 +4144,8 @@ STR16 gzTooltipStrings[] = L"%s|Leggings: %s\n", // Limited, Basic L"|Armor: ", - L"Helmet", - L"Vest", + L"Helmet ", + L"Vest ", L"Leggings", L"worn", L"no Armor", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index bb0dcd7d..862c40cc 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -4123,8 +4123,8 @@ STR16 gzTooltipStrings[] = L"%s|Leggings: %s\n", // Limited, Basic L"|Armor: ", - L"Helmet", - L"Vest", + L"Helmet ", + L"Vest ", L"Leggings", L"worn", L"no Armor", diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 2d47c221..635ba3ca 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3935,8 +3935,8 @@ STR16 gzTooltipStrings[] = L"%s|Hose: %s\n", // Limited, Basic L"|Rüstung: ", - L"Helm", - L"Weste", + L"Helm ", + L"Weste ", L"Hose", L"getragen", L"keine Rüstung", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 61777e40..9f39bd95 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -4119,8 +4119,8 @@ STR16 gzTooltipStrings[] = L"%s|Leggings: %s\n", // Limited, Basic L"|Armor: ", - L"Helmet", - L"Vest", + L"Helmet ", + L"Vest ", L"Leggings", L"worn", L"no Armor", diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 0588ad16..a39c1010 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -4112,8 +4112,8 @@ STR16 gzTooltipStrings[] = L"%s|Leggings: %s\n", // Limited, Basic L"|Armor: ", - L"Helmet", - L"Vest", + L"Helmet ", + L"Vest ", L"Leggings", L"worn", L"no Armor", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 2f534166..f85615b9 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -4133,8 +4133,8 @@ STR16 gzTooltipStrings[] = L"%s|Leggings: %s\n", // Limited, Basic L"|Armor: ", - L"Helmet", - L"Vest", + L"Helmet ", + L"Vest ", L"Leggings", L"worn", L"no Armor",