From 41e2bd433cb552a1a20b9c1fa0a4128f699dd7c6 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 24 Feb 2008 18:04:50 +0000
Subject: [PATCH] - bugfix: item duplication bug: You need two mercenaries. You
 place required item to first mercenary's inventory, then you take the item
 and point cursor with the item at the second mercenary. Then you click right
 mouse button and then left one. During the process of giving the item from
 the first mercenary to the second quickly move the item to the another slot
 of the inventory. As a result of it the item will be given to the second
 mercenary and the first mercenary will still have it.

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

diff --git a/JA2.suo b/JA2.suo
index 7e5477636e1d83d5869e49ee02ab142136424348..fc00f21c2bd287d2b37e116744ce2a42f1566b4f 100644
GIT binary patch
delta 6131
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

delta 8552
zcmcJVYgARo6@bqkuFB(bmG?{FB9C105fM-!NPWi#J}|~uwdSH|2%-X#RBg0ZLn1Ni
zLJqJ^G?Y-aGy$t(#L!ex5sey`w3rnVwMsOJOQTp#8lQBZqo`};%$f72cdc`|XXcwd
zGkf;T?Ae2(!0ae6?-;>cyd+6_(B9r2ERScQox0PTYfTQj3zjxV%k`U$N5F}a9INGJ
zrZMi|OTYc-A--MSkZG&=#Wb#qJ6IkiJxY#{^UV2d-j6kR%ocEQr%d%Ddsw_&qCk=c
z(<3Qw@({~XI4;*&l00IaDJ@e<lls%&UQ~~K;XR)KN%B%;r%-yflqW5sZ%MlAO}Q)c
zyn0E}aWlQYNI9=cS<+(q{jDc`O(A@anmC7kWl>5^&El@7ot%~SDIaP&wb85D*^Tm^
zBzQZ(TmH#=f;`+DQ<LXY$xMo3WUK$Qo#_Qo5ooDMWED2gT}ewU5K*&qY|2vDBsU&P
zmWvt&cnp(XQ(KWP#Yp|6cqvYv*f1Pz)!>hI4+!~nKBgr>F!mb*W?VjqS<qSy&X9>i
zeIZ^0PIYB|@`}Tr7*!2{Jc%0yKyXPQ_{zDb2FYdZz2ygYJJ)13e(hv7QAfKz)!CZ7
zV{7Bx7m>y#Nf`}E%H`BtvKnHck&}rBj=@m8AHb5;=3@^NXlMd+PP2Hd_U`E9+lsV+
zQU=}uih@^D?FIC_L(dv|-leBR?lU_a-mFb!@E34aDCI$q9;~~Tata|F3r!G#YXJuM
z{AwtqnbNS@{U#Xcgq_F16b%V0UEnu()fLL26w_Q`pa#<938@%u5h58~A0uv0wWPM)
z4OW7TnLXw5%ph#&#F9Fxc7m$lZQUN1;?;f8Lx9{6G~Vtl5Ri&xK2VO^y0AeSjd<4=
zj_c(0!jpbf*ijBzg{hN$@CSdW!t7@?fdf{ELC<K|i*{E&FuE7)!X1a03C(d3r_soj
z`ymMP`+#pJ#jK~QgBkkNFg%=_ia|V{uQM^ojYXn05?paso@U)K#VoQk2=)l_eKEN^
zslcABDWs{I4aSUM-7%<UJ#j?{9K{_IG-Z&MhGKIlRl)}@=x8t;J$pcXX{x61w5{+A
zmPOKvH7gv-h0vM^A+%R0q&154v5Pn7Xn9$HNj7dh>a@-12^;bJCK#e+4$8bPcGeTH
zAD8roEryJ$4o8J*YK|7Tfq1YlY}W;DJxhR|@p|-!c#McqMpwtgi8?I;;xQwZ#B?j6
znUe0RIa6q}h{3>hwEYytL9rO!5-%3mBo=diAc^5jadk&rl*l5`k^mKWvRG5uPxj6F
z6o|r<L=woEw_(HJIm~;G0M4>RvRZWV60m--Zs7#{E?EGWhX~piH&hq+Mz?eM!}*1C
zMu2|d=8^ou2S!n0&PvuX0#=L~O%eoDJ#SKUh%w{5vGAF0H$NIj^%${-M%~u5jfZ+&
zfZQ=FCQhWv_y&`J_DOubsU}yDDv+>!GIvQ*wX*jGILP14Rj(`hAJ7f`U!;nJvuV^+
znoUCL^_QRmmhhHh#ka&&(`XMAEGofR@mtu<)1SwmApy@!=c`8r*i0kc>i0V%-LlUz
zLKVJjgsQh2q1w`nP}Vs{s7dKi!P!J_oPkJ8p9^*3p{<%{q^>is7@^Fs8ljRhjZj(h
zjZmAjj8G>Q7@_VhG(z>xHbTwJF+#1)H9~#1m?-~gnj0QDePMVa5B8M$Xy%jO7Kw%1
zp&v%PPV+`@etP^K^!I22V$i;X#Bf$ySPm0$^HKru)iMF#{e~`ZUAOwRE2ywzkft&|
z{0U<5Je}mR{*Pj6H?N)xD?z^vS#RogU?NuL3xJDn@qwnd1=Y_i;1^bhXyZEsaNJdL
zo5Qhk4IJd{xi`Kfzv<W%)(y8fL!mBJHjSw0bwqKjH*5xb9w)3PfU~8>Tww_~)lOpa
zx4=;iCqA_huJF1-+fpc2ZlDMSr+S(^;driyb|gK6?psXSvO6>_ij)zK$t83s696`}
zFQ;B?FQvY6d?Ix!XYU3Jc3;H;u^FM5zvW(fiw(zlHx+5xEhEK@L+kt0bdLY4Zra%!
zm>DzHu^u>W6Uh>webKQQ3OQR2or5Q0)dwU+?|_oJmBKyy%BWdF>inOKQ0zl7H4@`u
zG_8jmiWc5*(2;!nLlft$CbYDE&s%9I?|D44jhe<W?6f*IMyFK?X!|P_=J;haM<cOY
z1M7<!ACbN}RiqxJD%O7txoGu;5W)U%iYG<&xz?X0+x_`(kchb^2$T!wn{aj&^j1S^
z8k17>J|0v-G%Vu<2Pqa4fJ3Umfe=T=t^_!PB?`ObQgn8%WR*s#0n@o^;Ff|lQXuZ^
z3NMKi5`vpAP)nnB^0lI_DAz6#m9k5h8lw!p){@gPPY?1`7ITXffAkZQ&KbWB2|e(K
zJ^WFALiz7CLXG|uMB$Q(Iw5lJ?}TszogJr(9fG(_@jkxk)6lo@RvNX>Z3iff-C9o)
zIO|adRVM-hvHv0JP6hAaqDBN08=zH;48z95LgiVH2$5w+g-G+~I!G-IfjbD)UvNT4
zf)bctfURFZ2oCXrRRU2-P0C1W`%~&XpYTr@yXPc0Gdz|Al^Ux-$5Gyj@BfQVw%UHG
zDypg(PVt6RbvsO7@{NLkZ+HP@a{R{N?60UWC&H`(8(Rdx$*%=~=?np!?VWmfmglML
zyZ|H7evS%ryfPIi`nLdRIIjy_(v@!eR=4m-oPJRNti42lo~e|5M{cFwzJKE~1vy*4
zCow|GbXiQD<`|p0e#BjYW^pxZu8OOP$EqKVP$#b$q1vt+p*(LGq2m4{pu%oaytw{|
zrf=JEbd19Fx5$U)&zzU>L?o=?xP|I@;?5n4;n}qvRXUNx<Dh#KJfa$U%lV%sVe-$g
z!F8$WEVwFHuo3v)Z3uCRgFny(O@b7^?Z4m@s$BOjAWvZ--Q_-gVe{yM6>}cYjL*MM
z-RHEMfXlo*bv0;frx==Y#DRsp?c;1`_Bmv6a_Mq36g{1p11E=)59VkA|5}n+2t_tW
zDPyJ@Q`9{ub!J6)EsVVuK7t$`<wAOq^a{B_iVHNHek<L}rN3EHUnv9aQS1f0AI-c-
za*iJhLAP)=8FvP;R$MfIxzL3%bH}Z>!Lv4YC`$pPFrWonY;3ywV`bWy1i1M&1ell<
z4f3g9Qt*=?mhCqC@s(FP?r>p~usn)+`Ns5*jVn*O=&Ib8by4oqrAMXwT;|hDj*_BY
z-G9I&NqN*ae<k_p&lexZd0yXFeNGNL-0%N!_cj_QxUmqq@US%^P#R6jOOw*+J6FSx
zRGK9>H3T`)e+KNbImp81ko_#664{uO3O?xO$EM)*Najv1HtD##6O(3Rc?7#sT1;_+
z?EBz}GsY6qrzh)5Hw?-!K>8Da4B1-&(y;OwI$FKq$GntLx{5V6R`T$5Mo+eNn>TCw
EA7%=XNB{r;

diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
index 408f1def..7f4a7636 100644
--- a/Tactical/Interface Items.cpp	
+++ b/Tactical/Interface Items.cpp	
@@ -4543,11 +4543,18 @@ void DrawItemTileCursor( )
 		}
 
 
+		// WANNE: Prevent duplication of items cheat-bug:
+		// You need two mercenaries. You place required item to first mercenary's inventory, 
+		// then you take the item and point cursor with the item at the second mercenary. 
+		// Then you click right mouse button and then left one. 
+		// During the process of giving the item from the first mercenary to the second quicly move the item to the another slot of the inventory. 
+		// As a result of it the item will be given to the second mercenary and the first mercenary will still have it.
+		
 		// OK, if different than default, change....
-		if ( gfItemPointerDifferentThanDefault )
-		{
-			fGiveItem = !fGiveItem;
-		}
+		//if ( gfItemPointerDifferentThanDefault )
+		//{
+		//	fGiveItem = !fGiveItem;
+		//}
 
 
 		// Get recalc and cursor flags
@@ -4879,11 +4886,17 @@ BOOLEAN HandleItemPointerClick( UINT16 usMapPos )
 		fGiveItem = TRUE;
 	}
 
+	// WANNE: Prevent duplication of items cheat-bug:
+	// You need two mercenaries. You place required item to first mercenary's inventory, 
+	// then you take the item and point cursor with the item at the second mercenary. 
+	// Then you click right mouse button and then left one. 
+	// During the process of giving the item from the first mercenary to the second quicly move the item to the another slot of the inventory. 
+	// As a result of it the item will be given to the second mercenary and the first mercenary will still have it.
 	// OK, if different than default, change....
-	if ( gfItemPointerDifferentThanDefault )
-	{
-		fGiveItem = !fGiveItem;
-	}
+	//if ( gfItemPointerDifferentThanDefault )
+	//{
+	//	fGiveItem = !fGiveItem;
+	//}
 
 
 	// Get Pyth spaces away.....