From 9fac33fe183c560191abf6eb37457fec88e958e9 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 9 Nov 2006 19:23:22 +0000
Subject: [PATCH] - updated Soldier tooltips

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo                      | Bin 197632 -> 197632 bytes
 Tactical/SoldierTooltips.cpp |  12 ++++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index 6753e143de3e4612c9f6b3a98ec938fe5aa121cd..d7360f27ac3b5f99bfda8d013931b4e5cbe5a4e9 100644
GIT binary patch
delta 966
zcmbtTTS$~a6h3G6-_^Bk)pfm=s~L*As3A$ECYvacD5+hDRPeG1(qii+vJGr42%#QU
zCOuF+gbzK)O5#s#V3A2~(32Hp7XrIH^-=`AD7l?k4T2u~;mn+K=9@ETzHfg2sKq~O
znW+)xBmh{CL?W58L1Y=Xa}=ldi8Zv&x7|CjTYH8EPQfMJr-e~dK)uG~7r0eljMWXo
zB&5&cGhJm!dr)7s#3F(;Snq3VDFAXrCd-%B!rVD4uh&BdcwrFE@CYzx;o%sEJ>Y=>
zm5>SXY0fztyGI$>6<z9L&!ZMqfm(1gS{3M5Dcv0(&`dD`AO_@W(lBcBy!`^&^`G`F
zhD-zJ1)J(v<Jrh&+KktA%=?U!8P>^iF_~|htsJt79HZ{5bNi%YafmPcK<-#PI6jXW
z9q+{A@lq_7{Y!i0@Gq-e$#&@O@U4C0?RbNcLkdZO9JEo<BXr2XVxC-onnNcw>?RLl
ztPGsis6L2x@(0l|Auu1MEa=QKUgk?&4>bsk!F1K-GRJS&-m<-8d(XB$)*;Ei2a9Q`
zk1MPMaX2)up(|-30~_&Xs3`;Q#*;|II_kAyacC$FN09>YSVMJA><&#8;=~9|ntAWF
zGPIC)0W+vIh<OO~xDT_)KaGtSl@wlRfKyCt7yC*BFC1Z_JyFV49>5jN{y`N%6?DR3
z#(7!U9+q$rTK?IkP-hu;2x_2>_y7GV>D4KNWDMdqnwrKGa(zV?eR?5EDgTv7pd}|h
zr(Lf_ISnswhN0{k{AiX>3L;FthsobBf0Q)K?A*$zG9IU0OE+#D<Bm?LkgpAhIDklG
zCmjf*gDSqDIk6S0xij_n+|bIv4K7iZE>{}(m!Od{OjUGMlWiK)Xl4NuY85;GeQ()R
zP$6eq@}z4mPJS;Lqh@4vl)TCPtUxdKqxe1-edgR9-Tr`W)b|i`H#8^K{M(f<-U*AU
E-;R<A`v3p{

delta 1053
zcmY+CZETZO6vyxX_G!Dq<I~Z0Q1;Sw>l|H)&>$p0AnB3;a~ZBv3w{9HSRqPg7z1Gx
zGPXd%;!85UxZ{T<z`m(lM4!Zxkm#~(RWLx+_?9s3%)syozW70ijC03g@JW8>-t)iz
z+<VS_Zr^~}H(*|Bke+fO#G|>nxq#X(E1iottFRBrhp-Z}sn(N@Z{T2Q{B1j9<Y26j
zLf8$iJ~?l!rK&Ob?OR2|4mk{!F*B}r*?eZqeqa^>PUWz^G`?FZgz8r%>IW+ph*-Sd
zEZRkvI3f;m6e6OkyunQolcy;b-w>VRu$FxsUSVg)yx76BPA%&Vwum(Q^akBpveVu{
z!&Stk?R2XL{$32K<AD=g*x!N0j#DnyCF5WW#>oU2H>3OZ@VJOs%$UqGjKz4FVrB{B
zWBg1BQ^zc2mN7wQIaA7%G387J6JjcvuoN*-#gl3#!qhO&GPR68Ji0K(^!R!EPK=aV
zBQf7dRI2->rfqKOwB#2qJJXcTQ12+hv=OLQg~_8jtHxzDGr3K5=hv&=e=SuAhwOB2
zcmut(7i)Bge<<<M6K9Wh(qI@qs>maxl2b1HUo(d!qRw~tLeHt^_EzF_cDsZd_(P>S
zBAx>4x0pxox1VzGub|f^uufMqkR3OW@Ke%{o@`GP1EAzKX^;^_GlsLRL44*_HAXol
z0*F%6O6<>m62nkGO@Q0cUC=I|iSmaKApazX9R?0i!9W-(`g#<ttNGafz86J<NQxHm
zve+$FiMRNvyuc4(pLmlU`o-)QTWRKd`8-8`l*N=^iE9-9S#G4>Ul!7A_!4G3ba57G
z+He=gsBi}+YN<YlW$uONr|PFlNM1n=#cyDSy1tdQ^zk%y(DWUwLXyH)@f*b(pHjWt
zTmNl@vR7`R5w!Xm>O843A@(p1wZ!s!+PFAfWQop-iru`%4BbGGF8_(U^wVEBLFKck
zr1Q72uh_{}{aycbt?%AfW528VU*nWF5T~|Llv39OqIP$z1$6EVUiG$!qkIS5;&qPg
zB25>j(ME}f(nN)BEF{<CgR*9vR4b<H==@bQ()}&4X#5}EYQC}eZo+#ukwZ3-ljEBo
E0{|o(8UO$Q

diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp
index 7089b43c..a68ff401 100644
--- a/Tactical/SoldierTooltips.cpp
+++ b/Tactical/SoldierTooltips.cpp
@@ -27,6 +27,7 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 	extern void GetSoldierScreenRect(SOLDIERTYPE*,SGPRect*);
 	GetSoldierScreenRect( pSoldier,  &aRect );
 	INT16		a1,a2;
+	BOOLEAN		fDrawTooltip = FALSE;
 
 	if ( gfKeyState[ALT] && pSoldier &&
 		IsPointInScreenRectWithRelative( gusMouseXPos, gusMouseYPos, &aRect, &a1, &a2 ) )
@@ -42,6 +43,8 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 		UINT8		ubTooltipDetailLevel = gGameExternalOptions.ubSoldierTooltipDetailLevel;
 		UINT32		uiMaxTooltipDistance = gGameExternalOptions.ubStraightSightRange;
 
+		fDrawTooltip = TRUE;
+
 		// get the gridno the cursor is at
 		GetMouseMapPos( &sSoldierGridNo );
 
@@ -93,8 +96,8 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 				}
 				else
 				{
-					// beyond visual range, do not display tooltip if player has not chosen full or debug details
-					if ( ubTooltipDetailLevel < DL_Full )
+					// beyond visual range, do not display tooltip if player has not chosen debug details
+					if ( ubTooltipDetailLevel < DL_Debug )
 						return;
 				}
 			} // fMercIsUsingScope is false
@@ -107,7 +110,8 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 			// Get the current selected merc
 			SOLDIERTYPE* pMerc = MercPtrs[ gusSelectedSoldier ];
 			
-			if (ManLooksForMan(pMerc, pSoldier, 1) == FALSE)
+			if ( pMerc->bOppList[pSoldier->ubID] != SEEN_CURRENTLY )
+			//if (ManLooksForMan(pMerc, pSoldier, 1) == FALSE)
 			{
 				// We do not see the enemy. Return and do not display the tooltip.
 				return;
@@ -301,7 +305,7 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier )
 			wcscpy( pRegion->FastHelpText, pStrInfo );
 	}
 
-	if ( gfKeyState[ ALT ] )
+	if ( gfKeyState[ ALT ] && fDrawTooltip )
 	{
 		DrawMouseTooltip();
 		SetRenderFlags( RENDER_FLAG_FULL );