From 447ba8cbf74ba0144968f231aa38a29b4284755f Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 8 Nov 2006 21:27:13 +0000 Subject: [PATCH] - 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 --- JA2.suo | Bin 197632 -> 197632 bytes Tactical/Interface Items.cpp | 2 +- Tactical/SoldierTooltips.cpp | 16 +++++++++++++++- Utils/_DutchText.cpp | 4 ++-- Utils/_EnglishText.cpp | 4 ++-- Utils/_FrenchText.cpp | 4 ++-- Utils/_GermanText.cpp | 4 ++-- Utils/_ItalianText.cpp | 4 ++-- Utils/_PolishText.cpp | 4 ++-- Utils/_RussianText.cpp | 4 ++-- 10 files changed, 30 insertions(+), 16 deletions(-) diff --git a/JA2.suo b/JA2.suo index e3b5804918fecfaff201f74f3ef940ba3ff16ad0..6753e143de3e4612c9f6b3a98ec938fe5aa121cd 100644 GIT binary patch delta 2806 zcma)8Yfx3!72eSM9lv{Zy z)9Y}Vu(dTVKSujJ3ai_E*62GK`qGSp8La@NzVIrA1k2+|jZaHZDwptCiJoMu%yZB+ znW~iaV=Kk_z*FqY(@v{YBNyvZZ5)-#vzB_(*5>IQ?4WQTchsrHNgTFQv&j)Q@hzyu z+QCNEOg-(OLyJPq-g@pgi|^XY+&xUy)4f0^ zn)_D+)Ej@f$rpdWt1hk44G?#9^-UOsJn7+_mPt*du8Mqxpe}5ruCeKkZ+fg5 ze|D&ObSBEwK}(!Hvu1$RHBsXPGzZoS;tlcICHLOsKrw==bE>S=yZQtv{Z zWS>N?Oau8+2CTLQ_PgSrnB#~2t_$UOC_>j+5~~0S(m^WiR(`dTsH3Z5;;A_+QYgZz zT52}h55-^udcIGK71U@U-@Zp}&BBEql`3@nXx&Jri{Z6Pgdx$B@qPhCn(>Rs%2 zs}g57n;b9QT&>NqBKf6p5en@5IOMzH?&IgV;M!d#rrkJdZ%s#CI@U|M7nZ%g6oUpf z$>rq;%X<$ZO%{C{rmTM+uO8_)f)UY*H82r1ujBr3IUV!S^N{06{EwlMX)3h$ti{pl zBRh?t{n88Q@XNrb#ws~{$w-j%?{S#A9}_x>aSyliq&mL)R4XH@qg=~#Y*Y0dw{zT} z%AL8KvT9YsQOCcGcuMiaQtm>Jy!jwJGIanx*>eI#b7TxUROuOlS+`?8GGxU6UvUfD zLKWBA$aVEvI&*V2k8qcJ>FbV1F2$liKEBKoej36Osec}Slh&(-KXOceKZ@J;3x8OA9l-gmr=wj-=cdcA3c|99^I66Ta0w~8xgV6bG|m* zFQ@yk#xYA@U`Cb21n&wZ1Lx2ZyG`lp>6C`^=#>4xMLY`St+QAxONWrk-Vp;$gS

a>PaF>-%;@mTtHWPivE?K5X)~wu0gL9Q6hm|8SU17m{!ee~}l5(Bb|{ z&PF`D`nzY*k`V3KDRt@i>ZHF9o&1wkeyv0XPoNS`J1c++9ViY!UhTtU-Wqm1-7UV$ zu~9Ya%?6RB!;xzl8I|m!n@5((pU+^6e7=ztGyHF)%Om61DK~9+<=R!`7@4qo|5+7# zNL8}%R!PYy9+zJ|3{UiC-Nh0IL+wqlvZt%)_@mcTq~Qdc>ic7;bV@O* zon6R3g`iyf2sx;T1b*;!Htq|f47}sSJck^cVXm5uJ+CC#Gv~1j^AX_{H6M}JmV8}6 zO?}Qx7}9zTf7QfF(+O_jPFGIgi@T)JIW(g{v+UXJdFT4|cCxBNwTk}=n&kbfWR=$m zqtuS!Lz${GJdwD)I07#c92Z72toEWRi66x)5?IS#w5|w#t+riyuE34Nh+5j60iHU8 zT`5j%nKXR~bn(w=hVs(yQ5VTf+V2>q<5N5hk|SRH|LY~OhHXUKwy{Zd@}jDhw;red ze1c2HkR!*h;Cl3TxX?ivzKBNo^*ELrmACDERYHUnO-Qv@j-d_maRxH&>2!Po`Q;?; zw_lh+HF!zzYrmB{QYh@P9{HJ#?nnjAb9>o43%PBR^S5W0|8qpLYyaXmsBmb&dc0d@ t%-1C=W8(J0ZYg*f? zPdPu@#N|h0Q<@Sc^_j*6Ekc#JRinkF#ne<|{9zjXBNlq@8$r@k|Fmy%-h1b}_nmvr zcb2K!Wv<(0ZcLX!;X;V+o}QjzTDFY!AIe&=w^DY&Dh^fu(Ing8$58WjZ;h!HCbiL< z9#AJ|SQ(9CStT-9JR(i36vbklC>7<5Mi?vUyrT34qC%|UpAb`6+}@tRbUzCpAOxE; zE-f!GEG)x#ofYFy?(4X_t|T^8suikR^yk>D^w$-^7t<>yhd5 zNJ3cC%#Bug*56x`xx8lIxq2q@xc1h$cMdeeM2ku=-jdHjs_c~Uy-KURGEJ-f%c^zS zhkMIfJN?WiJ~*_W!Cx?4tI%ge)V z^+EK33310HTtN5U;uv+?K@MQDwr918N`NrqC945ddb0@*%u=bS5-Ye`JR;wy7nOr@ z#>R`bU)!N{rV=BmvjGWQ zLTgl3X?F_D4uz6wKtgnrRw%Z90S$u!mqwP%u0~fG&h~rp2uf&?YZ1UyW0?}ukMm5fSsJJ7_Ogw zA+tfA3yddr%emkK4E*yR#+d=7eBb5g4|2Vb4#XJ%&A89UAO0Ox!597ZB3M z4=@w2(0Jeeiihaf+OL2(H?NJ_HwSqclo`XF*Ui=$XYJuai^$R zW)vkO{Vz4;e51_CUlxi2n*9jQrUVD*3jC7DbsAIY;0f3$trbJ%QD|;^7Pe4c2__v# zMku-dcv2{MTi+fYCgS}~B0c5oKHyMsKCqf448;x_C2c_HXv2Z9jgGdTYg z8+4`0C}ptFSR!*LTg{-{Q|O@PaU4{Q9aj4KE*8GjZWEQkT*A-ibO^Bs6Kw$3> zv(n{LSgbTlp>Q%yYTA~H)yn2Fntc%##Q4H!>%gthT&C4HlPMi9R+75~Wf*E~z#Jo- z&@?u%mRnh+dWBf0ICllGZ&&@kpi3U>$fj3bk)01<^ zMS|}{rt%?O8pq>Dac-J4Ib{mj>QL~8xMN<%?Q`ir#ZA{+n5)-DZ8-j>m@U4Teccvo zM5HHng1gk$%CCa1Ux;LKz0X;_zmz-H(}O+qWFa<^t%xhbP#cS|)Az>N-$2us^)4i3 z!9zK&UiDB2GATEcYiV9F8#TVQg&{}%m*(iKT4C84inv[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",