From abee009cf78ad5416f1ce451a1eaf0b6bb2c644a Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 1 Apr 2007 09:14:17 +0000
Subject: [PATCH] - bugfix: the roof CtH bug also affected the numerical CtH
 display on pressing "F" (fixed by AndroidXP)

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

diff --git a/JA2.suo b/JA2.suo
index 6a35062b0a99bd9ccc04cf7c8d13eeab7ccecce3..a77ec3cb5c66bd136c3cfd3fd5df1c092213fed0 100644
GIT binary patch
delta 625
zcmd6l-%FEW6vxl^-E%W|-SB5qnDe3}#E{HeK~M{1frwq@g<?U`pimKpq8naJ!MgC#
zox1iyB1Lh<dlw6XK#*CR%~)ILZqvdhNP&9ZMP2k4^jtiA&i6d$%Xv5_G;M~a&9#6k
zS^ILxtt0Q?Afk9IsAilnwZnC+7ORMKSXb&&cSA+qC22nm&?6e5hjJ6;b-&wFmNx}&
ziFls^G;GVUpnFmo`BMF}d;-0(V8yCKRT<*d=xM}h4E0M`uSq=rZP`h8q|&w=Dq4n*
zDyL31_+$fdUFTA&PYSL0Tg1)k2ZDdj){B<1Z?9K!L}zDSezu2N{&fuJTtl0F^R<&(
ze_))$A27w9efXFQ*yMvG##klcvmz;60pCjrCU<Onxg+RH;}W82p}}2S?AR4t{e%_Z
zA|s7jYb+xH_hm%Ck;P4*zNj1B&~?}SypY8c-cHDCX9_)h@Db%apMzHsErTCt5&bv&
zbPpkTizasaoBvJA)~oMW2S;)!QI`z@_h(S84C?y()7c9hGPhw_gn%qXklJN}qjZ;s
ZqAA=~SDUZ3aN;xkk){Hyrh@U_eGa~M-nak&

delta 568
zcmd6k%_~G<6voeU=PrC)1~W8CD4$J+t)ftf8Xu9JLMfCYY$nB>C}U&cRmZ|Y*-*YR
zi<@jll(O-48PX_!0coa0x!yZ_d+*}(JI^`i>8V!_X?jRI99J_ot8?boCNJP1B0U^X
zms6209GMBVH;+gJMXtzpddozn9Q$dACTWHyWR){bmOj~z(Kt=pg6ML3Ai@FXysC_3
zi7(e2YQq8dfkXYVEK5{*s={jdHjeVIcHBwB78;h<w&7IrKKPNl@Oj3cXNaUEP5WuU
zh@2y$t$KB%@fIq0+e8s_9GC1fG0X9L6d4yLeBj2YMAw6ji;ofqq9_AOxG9Q4W9!k@
zH=d>b_Jlp~XiVbCvyJA9#HAQIfC_uNKvk$4qPW%1_c5&S^%Y9F-9!)jqHyv0D>U{?
zQg$KsTiX6w(z*FgX8lgctf#kF_)pOd;~j_K1`~q?5yvsoh%Bp8A;^EQU#PCrvsvHi
SG2RmJW2q(%qb9E0IDY}LtIxLp

diff --git a/Tactical/DisplayCover.cpp b/Tactical/DisplayCover.cpp
index c5e0c2a2..4d81ed39 100644
--- a/Tactical/DisplayCover.cpp
+++ b/Tactical/DisplayCover.cpp
@@ -612,7 +612,11 @@ void DisplayRangeToTarget( SOLDIERTYPE *pSoldier, INT16 sTargetGridNo )
 	if( WeaponInHand( pSoldier ) )
 	{
 		UINT32 uiHitChance;
+		//AXP 30.03.2007: Fix CtH calculation for first shot after changing aim level (roof/ground)
+		INT8 bTempTargetLevel = pSoldier->bTargetLevel;
+		pSoldier->bTargetLevel = (INT8)gsInterfaceLevel;
 		uiHitChance = CalcChanceToHitGun( pSoldier, sTargetGridNo, (INT8)(pSoldier->bShownAimTime ), pSoldier->bAimShotLocation );
+		pSoldier->bTargetLevel = bTempTargetLevel;
 
 		swprintf( zOutputString, zNewTacticalMessages[ TCTL_MSG__GUN_RANGE_AND_CTH ], Weapon[ pSoldier->inv[HANDPOS].usItem ].usRange / 10, uiHitChance );