From fd849275b215ea7e7fba6c947afd102fee9f7261 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 21 Jan 2007 19:31:48 +0000 Subject: [PATCH] - bugfix: CTD when tooltip should be displayed on militia and no merc is in that sector git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@673 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- JA2.suo | Bin 197632 -> 197632 bytes Tactical/SoldierTooltips.cpp | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/JA2.suo b/JA2.suo index 9876d43231b21570a416cdd633b689aa8ddb6b08..a598e2ff271a8dd1e9791d531b9d1d938993ff9a 100644 GIT binary patch delta 1886 zcma)7e@xV67=J(CyMsIZavXdQVn7^P5(0+!4=gC@r)3~VsI3(X22Pzcg{WpM!L7}! zTw&ko^G{9EtyQpO-PV^aB`gUO2$?RRF>qzZMha`73B>ihm){34|{6X#Gwx#?tzI_g&yyl=8a~U zz1`M*rYP81$3Fh0ms;<)NYI$RS8Y_jX!p*kc2Gwf^1Oxi4hweaH??_a`mA%4{&;MT zULWUHW9}gE&crzsvr7>|w(9BN$|M|1wKKhMS1p!HXQaWUSRB* zAa?mVsX5pk(9j#bc!%7lP)-$(DDjlpkIl6HDy%dx1{+y>0!U+W4Ex#lY*5p9Nyh#6 zk3o&;R~dIgXe@`POr@C?0dU^c{_O7&&zMetJJjbxDBk#O&>v}kkh|mpYcx|B>^B!B zw&;8SOZlhqC-qM88@nGv1g#lDm1YU!d3;D#v*1F&({PQ*oIbl4)Exgs=41`y9XX2C z&}^X=;y1ZM)29>%)p)q7{QTQU9SL&woRn|2Jk-;8wo_)QhFa+5^UV2i7v9sN!dN-u zee@_y-%`s@$R*zo{CdM_}U3HXvv{g!#5!- z-f=m|w0;3wKwXniwUjUpZg1)o!+Bu_})xLaJ?ZJO(WmA)Nlx z5Kq%TSl~a&K^Msp$I+Hq>?#zZ*guV`gqx>S9Z#(n|JU>?XPQ_ReelUuR6Kx#wDxHw zE%0-X(b7V*qs%_;xTXfgl5ZR@`KuAA>jRy;Y{jPss(mo3eac7Xe*rFi?Q8%5 delta 1655 zcmZuxeN0tl7=M57y_fElbH6wjB1Ar_4N`MiYf=)sE>|lj!lJDjEtr>#jTGs&K3st- z$8By&JIm(}oiWxQiBRUXURwlcA`@&~mqSe(%@|A|{20y|%+vc`)Wddo@1FPE^ZWgt zk3G+`(-hO1V%ovA+@mwbZkwjL#8}UBUD@(&QG6?(fiLk@dwAC~{cuRAw>kcy^F=2R z?{k0b@G_solvMheM!EZ8ml9POA83ud;k)>Mnh&1CoUvb|1&yFj_oRTa3~9Q0i-&zj zT-a#b(q|AdZiGsWU(;3^(eyISc_-%Gxbf-q0C%eL40mSq`^cwg%ks57&D#po4i&Hc zTvNK>ygK61fih@*i3H}O(}N$aa!4sf9jMP%;btT~D^2~Me`rk?R?u()d7{(_o`HR$ zJPXY&-Zs@IdDK&<(@SB{TkVJupGJs69SA=;$Isn0tbwg(TUdnENZ@g4o7lUomOU%) z2KgILW$d~%o@~y34`YXpYhI9AJ!ofWO9GSB z`XI9Avi#Krzn*5-3A0OO3m><#ebS9`P)DDIjP;-vdb-`4cAmv3y>JXW^$a^J#*WFl zsc688^wM#K>>a#^P){E|TjpYrt0kMQ&i$;=`3_&Cb`$oXwBaU3{S|U7)$DCnksQb7 z-BZ{|gFW!*-0mUXnBi-X=dd#>=Y3i-DJ!P>qc~4re}gniox&^0a8#MFDwVw+rKW8N zdCFw&&9Z_zI(P!rbl?iSy2~D3EIXy2;vox>6RZWjf7U`K zPAg>goP})qL(M;RfeaI8)D$N#SlSIkcm%rFu2oa)rt*`hq^c6RmOr0BjsAdLC!XlX zcIa7lhLXMMJSq2Jv7Hs`24pRIww?LmiX#XL97R}PVrMD$HXowP!`PSR0 zc4p4+r%Tc=&(4bH|51MV3o!8!RD(`USUoEkRsDTv0qub?HH*5bdD_d!2eovfo_epr zE!1gkpX#$xq_po`PUq{t0a8sWk)J=Tp?)Hn_g9g&-K_cO3(94qBQ z+_aG42^4{Ljlq*sV6VtpW-dzp#R}+!c9CeD!g74siX!rl;0szli;y@xf(jT7kCqx` ft8?hm%Xp4T3ZPNqbvQ-Tgb&RT6Cz^rz0UsuWt{C; diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index 1d3936380..b35f981bf 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/Tactical/SoldierTooltips.cpp @@ -50,10 +50,17 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier ) // get the distance to enemy's tile from the selected merc if ( gusSelectedSoldier != NOBODY ) + { iRangeToTarget = GetRangeInCellCoordsFromGridNoDiff( MercPtrs[ gusSelectedSoldier ]->sGridNo, sSoldierGridNo ) / 10; + } + // WANNE: If we want to show the tooltip of milita and no merc is present in the sector + else + { + return; + } if ( gGameExternalOptions.fEnableDynamicSoldierTooltips ) - { + { for ( INT32 cnt = 0; cnt < MAX_ATTACHMENTS; cnt++ ) { if ( Item[MercPtrs[gusSelectedSoldier]->inv[HANDPOS].usAttachItem[cnt]].visionrangebonus > 0 )