From 5ad73ef703bdb91b497cc6aae07323002dc818e6 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 30 Jun 2006 21:25:37 +0000
Subject: [PATCH] bugfix: - Placement cursor was shown valid (should not be
 valid), when it was inside the shade area near to the valid area. - Removed
 the "flicker" that sometimes appeared on the Tactical Placement screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo                               | Bin 70144 -> 72704 bytes
 Strategic/Queen Command.cpp           |   6 ++++--
 TileEngine/Tactical Placement GUI.cpp |  10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index 553cd8338f3a6b025e9801b775a2601f4bf7b7df..f4d2eed3929c35d75e53d6058937d5d8bfe8b419 100644
GIT binary patch
delta 1884
zcmb7_U2GIp6vxk*&Tdyao$YqJTDr7Oajmsr*=<Xuv<3P>k*2_66(x|EwXL<Vm9?x0
zwF%`-5QuP7Cq^HP;Z02%N36b>AdOLsA}{)46rxZ1V2n-tNG$%(?5;G6OXN1cnLFp6
zz4zSzx%YJXoId@5KAY4{I{k6uiPt~jB0@XkOzLM@Z_$XHGVgm@yAQ^4aF7ORgoY?h
z2WWyG|4-{~Sj#{v<Lg}a^%j+q3Cjv_9Zg-)BOY1kOXrAjoQq3{8DHuSb5;-EiOw+<
z3KA8`s{1HGO)@C<Yp;gz3d>vru&3NOQuqq1T7P9n*g*GD7{@4yP+^vsAAzStJcefi
z1K9~S(=be#jlkp#`=3CV)fkppa$%~4^0-lvHT-K#2ji-@BI^ACVSnRSe+B!E(mWrp
zNU)C8WW{Hy=Z%<3hvJ5w=i@AdQrgkGp>i0+KsBfVO~3-RU?sQ*M8LhE4%`Ro!Tq2C
ztOBdS1E3MC0a5TE=mE`O5#g`JyEWTihj*Js4YVGecF+Mj!3MAqYyw@N8_16r&m?|(
zx9V_|e{_!Y@0wguub<MEiByQ#JvP|h?EX&e(`2XS{5-$gV~AjZ?4~8@Dt&2(tH#2m
zuM9s1L?m&NL1*Ff`qt2kup9>`z)RpHSai7VGQXm86;I7{@fQ0kv!za_eYQ_$(>@vC
zIzB7|$~#|fAJRE8Q^PCmh===?Z{Acd@7L`=bnbiK%X|1n*bqKH?78QQIl9CJIk?H?
zqK|iS5Shszv41!DYy0nIyhIu#?<O}@!smS@*jH}nb7_M|wHtvU+xb75!`$1s{VqCN
z^gX+x<2d9y$t5b5(~CC1FW}z9KnrzKE5+>TGTy|y><eYQN?E4vKZmq_2qY4;nO}L0
zo%HYq(T<alGp1@Uck+}yq;t%E&C3soyvw(t08HR2S+tp+!Tpi1G4w|5DU<g^W4NqK
zqQrr{Rg~SVtiFN#HT*m1kUQ_wcqVArow+I2)Z8L-hxE5I3g9B#YVLikYQDwXQZ?*p
z4@cZR$QCQ@r*Lk<7R6Bxq&SSwIFQ{~v;`GptGl8-Sj>SoT(!chX!J02?)&1cmhxXd
zdgnVSV}HV1$4y_Y0%ow1(JKXyWkjZ&ryUP)$4nItE~zUQtB>aDP$m4HqbF%Qp5rK8
z6DYI?Q0SzZ{oevCW%)Me>B@$ed)<Bj>e|Mw(E3<9$b0b&$<;J6isQCcEZ>O@jkqFP
z)PpUJ<1Ycp3ndrTt+4C_*;T4ul3Q@WZSH>osqkZ1Xpo*o060r@(9P|7IZdM&8lt^a
m(3Ki7o}!fG^*pq>0D2{_)>ZU=0=bsUD>dV;t);d%8~7i`vZ1g5

delta 826
zcmZuuL2DC16n<|rNjBL{vSzcP#5A-R(_%qm4<c4UiCRgeMo>W%Y-ypWfd&n<%_-uc
zRS-%B9YqgC1S#|oyK2Ofl2Fi|`~@O~UOad(Ab4nevszn>12gZ<_r3S+H*d>tSos;N
z=2@^Xm|dTEvVtxEcsFa8SOwWetJSg%&r5|TS%g>XEYwZxaX18*;TnuWzbO0ATJ~jJ
z0SppD<<8=tSkf(pBKC}a2fZFZ1W>szSY_X%0Q?rWOaPZkC5{fo#}fbY$m#(Yl3J%p
zzW_y;q>~_>j`MWA3VFCG0d9mk`i8=ko}<b!hZ>_SFG(qI0>-IY3fz#8Js!G3HajT~
z(3U=>P2LRWbnOrD7c81NU0x#FDm`oThK$O8npxg3(;kDkCE%sV2c8M+=S3^0@AyZ@
zZdwJ!l2hEN0La)$F(LC8qqDdin@(fVp2=P)#VfAQ=$E#3DIg~&*WAFOws3e+v%fYj
zx^+fKh_>|QI4^!Y!|T~2mDPqGCtUj3<m~2Z?*ZJfF|~#d7{*9(`u;H-6jNagi+d&}
z#5|%Z*4-H6BlW!!H~9Q@Cf>U7q=QUa*de?Yb~%-pciO-CQGe~hODHry`pjgz*V>d9
z(-^nd((mW&{!d9=#k1IzYG-J`;FW(G6gVgrG#nAnqiBkKVLT=1+jCpGJ?-6sYxqi)
z?VDq$6?L3Ywwij|n`%FTIE>=9jsv1>;8DCQ-W%A*yIDj$jbdWk!{t3D9x_bv{yoFL
E001lRKL7v#

diff --git a/Strategic/Queen Command.cpp b/Strategic/Queen Command.cpp
index 9769c07f..9058726b 100644
--- a/Strategic/Queen Command.cpp	
+++ b/Strategic/Queen Command.cpp	
@@ -172,8 +172,10 @@ UINT8 NumEnemiesInSector( INT16 sSectorX, INT16 sSectorY )
 	SECTORINFO *pSector;
 	GROUP *pGroup;
 	UINT8 ubNumTroops;
-	Assert( sSectorX >= 1 && sSectorX <= 16 );
-	Assert( sSectorY >= 1 && sSectorY <= 16 );
+
+	//Assert( sSectorX >= 1 && sSectorX <= 16 );
+	//Assert( sSectorY >= 1 && sSectorY <= 16 );
+
 	pSector = &SectorInfo[ SECTOR( sSectorX, sSectorY ) ];
 	ubNumTroops = (UINT8)(pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites);
 
diff --git a/TileEngine/Tactical Placement GUI.cpp b/TileEngine/Tactical Placement GUI.cpp
index b9b433a9..a96b5162 100644
--- a/TileEngine/Tactical Placement GUI.cpp	
+++ b/TileEngine/Tactical Placement GUI.cpp	
@@ -566,7 +566,7 @@ void RenderTacticalPlacementGUI()
 			gTPClipRect.iTop		= iOffsetVertical;
 			// WANNE 2
 			//gTPClipRect.iRight		= iOffsetHorizontal + 640;
-			gTPClipRect.iRight		= iOffsetHorizontal + 635;
+			gTPClipRect.iRight		= iOffsetHorizontal + 634;  // 635
 			gTPClipRect.iBottom		= iOffsetVertical + 320;
 			switch( gMercPlacement[ gbCursorMercID ].ubStrategicInsertionCode )
 			{
@@ -719,19 +719,19 @@ void TacticalPlacementHandle()
 		switch( gMercPlacement[ gbCursorMercID ].ubStrategicInsertionCode )
 		{
 			case INSERTION_CODE_NORTH:	
-				if( gusMouseYPos <= (iOffsetVertical + 40) )
+				if( gusMouseYPos <= (iOffsetVertical + 30) )	// 40
 					gfValidCursor = TRUE;
 				break;
 			case INSERTION_CODE_EAST:		
-				if( gusMouseXPos >= (iOffsetHorizontal + 600) )
+				if( gusMouseXPos >= (iOffsetHorizontal + 610) )   // 600
 					gfValidCursor = TRUE;
 				break;
 			case INSERTION_CODE_SOUTH:	
-				if( gusMouseYPos >= (iOffsetVertical + 280) )
+				if( gusMouseYPos >= (iOffsetVertical + 290) )  // 280
 					gfValidCursor = TRUE;
 				break;
 			case INSERTION_CODE_WEST:		
-				if( gusMouseXPos <= (iOffsetHorizontal + 40) )
+				if( gusMouseXPos <= (iOffsetHorizontal + 30) )	// 40
 					gfValidCursor = TRUE;
 				break;
 		}