From 793bde64eeff8f47d51b3014b1ea36fab1f007b7 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 6 Feb 2007 16:25:08 +0000
Subject: [PATCH] - bugfix: CTD when Skyrider is escorted to his heli in
 drassen (before Skyrider talks to the mercs) - changed: Location of the Heli
 information box in Strategy Screen in High Resolution

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo                                | Bin 197632 -> 197632 bytes
 Strategic/Map Screen Interface Map.cpp |   6 +++---
 Tactical/Vehicles.cpp                  |   3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index 798a2021d7a929e535a5735b6690f1b6dcad2fd9..e2daf3e59b4373ff0110c389ebbb721f5ed426d1 100644
GIT binary patch
delta 1636
zcmcIkYfM~46rOMPvdd#x7B(PkVYx2PQd;P0jJ37h(%2TnNUJu+5(UJxHCx#5Xi7D(
zR1=85TBhvL#8ga7Or$<<^!A5QXrQJ)G_=?sn#N)^(Zm`_Y7^sQ*K>CXls4`^=jLSQ
z&iUrdd3<vsqt3{v^MjC<En++ESxsNSCU_VF+QZsrYgx#0K!n9E(IdJ=Kd+j_A<--P
zct4QP^@|R%Pdq0M^8T|T#H&X{w-HYtu*u^>9djPDzrr}DY5eJQ0eLFJwI;&{Au3p0
zD%a&Pg038>ww$7DCj*~g(}&nhuhE|~q`_g_^kiuzv3NW#r4ZJv@tnqDU;2+3sQdvR
zd5_lPxG~W5Xgh4`!sI<RNTJ@GE;0(wbQIFyBK&AonBApjW{N4Y2p@f#CH-TwN0Pd;
ztgBKzbN8#ke_U!o_Zgk%U*AOMCQ(j*pT!3Hy%O~w`!R^9L^+hI=qSs0i5))0GH&jX
zutBrjqbF_9Gp_RP0!!><`w&e4ZB&~n+sr8qQ*zr8PSRnPE{=62vAqmWm2Orihxxe!
z+g(vFTJV;+$BXxKY44~En1KR(WuwJHxJ`F0>LV0+*Mbm3>gd`GM?9#Zffh9A)V7EQ
zb*^TsBQ0r@qu=z&dpPfoj-a)Cbv=8<2Ci(FKOyFqe3%zBH;kx-uKI6u8Q0hv*8CvB
z14UCMXc~{8lCHdi;>^Yb-GpegMWab;Delf&vX%#`{|sGf@4BE0Z?r4DVvAKU6<Ysz
zZmVcumRbbr6s>%7B0=5q)-cuBOn@dPxTJas7F5FppYdItU!$v+QA=m$P)#oaFI)AB
zS>CA+FETIcf=2M(2-NV_eEJpAL*aSkQ^q`=r(m_LcIeFdb`hr2ntZ{&zi491{-W_J
z`7PDF2B%{?SNpK&wv^A%w!dWd-PKYoMJ`4+C*f9b4(kQ*2*A8}33a$HO~BgkOzhsp
zX?hizLd4^~ROhAX`vvQ<_DkEzB)T*eT8IYHzs5H?x0P|lTU}3mzJm!a+g4|!z_XhP
z9!m6tZe~s&|Me`Jbh~el-W<7vFlv@v_NTt`0jS`*W}3c^2(>(fVtQMX`x2?u%Tk~8
z(utojng5s=;4Y@~^9ylb>)_gP%USj>TQ5&-<*C&n4`#Qpg}y`&>=Fl7?072fv}2b3
zgxy%XT+7NkA-8hj;OeXXC%%oXX&xVzkpy4q4NX2x(>GCQmi~zEvuOA_f^;p4Jo@c2
tidA^lj-#|OQ#PXA7^>L;I;G<TO$5<oy{iJc;zhwo`VE-rH{>7ge*q>KmNEbU

delta 1495
zcmZ`(YfM~K5S}@E3;SZ1S1${NWi73tP%F0lpsh)ll&Z9#+fo~nie-5Sv^*BrN&y3#
z8Wn9#C@0JK!!-EMq|{Vy%<@O2iESgP1`~}B)K&vZVyYyqs7)-+xhqto-DK`LXJ)>c
zIWync$dEHK<h;<TCHeNGd=%Mp1uXzDW%O$Mw4Dy#KE_f3K?p$@I`~_~`)8pM%Ap;e
zVa*me4s}q*njkd5ZfNGU3xdY7wbvr1QT93e5>9iBvlGT`rwcJf+Fa{wHrBXUvSf-Y
z&G5V2nB?T+lboalTA^F+bLSYn?tTre#;<7(Z4(Lr!D3<2Sk|!ISzcaF{Cib<yV@J~
zc|OO9tP@4J-ss)?L=bKA!*km#2?FFB7c&jdc%6rD_>?TY^r)QsAY1w_jq-U?oufYV
z%dVLcIq;`TUiW#8hRd&SCy|Hi-#Li`NVSN?a`>1=i&rs!RNw~ND_rv_mZ*H7E)SoN
z?H6c4?Kjp?wFP~6=S;9(ee$SQ!&*9R7qzh|4W~p#J>RsE8`aItZQ*a2G50epZ5%gp
zJv(CWCt|6KX2NKv#dk$AwGIhSY->J#Y@v{j8fiLKP~a98#UeUJQs{cN(CG4{I7)$w
zm>xU18Q&WmtTc1fLxAI}TmT-HCaC0`?QE-JeURn2X)C^`?J)Rw$SWu{`UXayU~LU!
z)a0t5lcOjK0Hm_CFcmrmS=G+r)kOhxmL}+9<|s`YJkIWIyaVvER55cp*f0DayDEDt
z%L?wW$+){k)G!CT|2J+DqgH=iG<X%)BG9h$m^*q4BlPwRdSl+V@XcfjMe)TXyFKo#
z)*Xatcr4n9x%A5{=8P2j5hNDulHWgAZSo`evkh{(aLJe|j0k#K!#XuxuN1|8BeEr8
zr*FqOLxDq#Xeua$=5a0M&S6p_GnWSp^33*4a-hVkh=!H)T^R;xYz%e!TE~s_$5(hX
z>JT<epw0!ZQhtFAXwTQW1=q%`r%!I+4>WvAq|?%?m`df>@DTl!zyPZWz!I8T!Y^s2
zM!3i}%f^@I(T%n^?m`!)Is)8o#ey(&lm8kXiNo!2cpwfpnU^z<{pg76576Qb%%nOi
z9&%SRAu8Yql=9Ttpm%hZW0+a=xUZ9j7w}x78dM8}*<8afJ_A-Skzu-t36vpU1wI$u
zj}Juy=vV#TOSdPnD7TD(UCa>mSju=8gdV2cZeCl}p9F`jH=E@7N71uX)WZ#_y&_WS
zo1gIjy)e&{%#3>+T)kF->dL`?7nEf>QQ?m`?RdmY+|H?+M;9=J>*B?py=SqGW-hjk
zOKXD0yZwx9p2JTa{xxx8smGyOP;Pk*%{k@^z_<y9cJ}CF5BKQmoTy$D2=HM)Y-8@1
plJ7hdY(mF$O1266M1db^BpXL)%+I}Ap^g5M^(MxwH^uMCe*sXko7(^Y

diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp
index 2da8651e6..75bb095fa 100644
--- a/Strategic/Map Screen Interface Map.cpp	
+++ b/Strategic/Map Screen Interface Map.cpp	
@@ -74,9 +74,9 @@ INT32 iZoomY = 0;
 #define VERT_SCROLL 10
 
 // the pop up for helicopter stuff
-#define MAP_HELICOPTER_ETA_POPUP_X				400
-#define MAP_HELICOPTER_ETA_POPUP_Y				250
-#define MAP_HELICOPTER_UPPER_ETA_POPUP_Y		50
+#define MAP_HELICOPTER_ETA_POPUP_X				(400 + iScreenWidthOffset)
+#define MAP_HELICOPTER_ETA_POPUP_Y				(250 + iScreenHeightOffset)
+#define MAP_HELICOPTER_UPPER_ETA_POPUP_Y		(50 + iScreenHeightOffset)
 #define MAP_HELICOPTER_ETA_POPUP_WIDTH			120
 #define MAP_HELICOPTER_ETA_POPUP_HEIGHT			68
 
diff --git a/Tactical/Vehicles.cpp b/Tactical/Vehicles.cpp
index eaeb47cea..bdde236b7 100644
--- a/Tactical/Vehicles.cpp
+++ b/Tactical/Vehicles.cpp
@@ -293,7 +293,8 @@ INT32 AddVehicleToList( INT16 sMapX, INT16 sMapY, INT16 sGridNo, UINT8 ubType )
 
 	if( !pGroup )
 	{
-		if( gfEditMode )
+		// WANNE: Commented the following line, because we got a CTD when skyrider sees his heli in drassen!
+		//if( gfEditMode )
 		{
 			//This is okay, no groups exist, so simply return.
 			return iVehicleIdValue;