From 902200d39f86106696fca1b3fc288074e7a00653 Mon Sep 17 00:00:00 2001 From: Lesh Date: Fri, 8 Sep 2006 18:17:18 +0000 Subject: [PATCH] - bugfix: Gas mask was always worn in low-level tooltips. Fixed git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@515 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/SoldierTooltips.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index 2420060b..98e6c1b7 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/Tactical/SoldierTooltips.cpp @@ -32,6 +32,7 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier ) MOUSETT *pRegion = &mouseTT; CHAR16 pStrInfo[ sizeof( pRegion->FastHelpText ) ]; int iNVG = 0; + INT8 bGasMaskPos; INT16 sSoldierGridNo; @@ -129,8 +130,9 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier ) { swprintf( pStrInfo, L"%s|N|V|G: %s\n", pStrInfo, iNVG ? L"worn" : L"no NVG" ); } + bGasMaskPos = FindGasMask(pSoldier); swprintf( pStrInfo, L"%s|Gas |Mask: %s\n", pStrInfo, - ( FindGasMask(pSoldier) ) ? L"worn" : L"no mask" ); + ( bGasMaskPos == HEAD1POS || bGasMaskPos == HEAD2POS ) ? L"worn" : L"no mask" ); } } else // gGameExternalOptions.ubSoldierTooltipDetailLevel == DL_Debug