From 8ff617d08c755b202933a6da2bba71e35c89f928 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 8 Sep 2006 13:51:19 +0000 Subject: [PATCH] bugfix: New drop item system (XML Drop system) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@514 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- JA2.suo | Bin 95744 -> 90112 bytes Tactical/Inventory Choosing.cpp | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/JA2.suo b/JA2.suo index 292794c332766b2531d3665fc085c6a8b535facb..b808fb99d0fd908337cf9252024db63e91c8c6f6 100644 GIT binary patch delta 1565 zcma)6OHUM86uzgaY6_|Drkh7vL<3@o8Z^EiQAZgyfo>a{_*mc=V>d>LC>?1Du+a7q zH%?~4+>yH*V>brHmd(J(l>eNlW zF;n-<+bxDS@%~_{?&V|35g4b_T}H@Qv0_9I`P`V}=I|$l?6SMuXED9nkRGxvA|Z3U6?ywDAxxw3M#7ppSLKe#x-uXpgj5WZO6)Z z))>dEh0PpbvuMIP4se7`=_cPEBsvpw55T!{qH-V*wez)M%$O{U+Wb)T!%DXguPIl^ zp~8@SSh&b6fM&?fq9<~rXR%BcM{WOvFzJEfGMC4Mo10w$OU?|=FozL&I89X#=x%98 zH+_(u*S4wbKLcNYuWSQG0O1ny!u{##;PvWRwt;7#&LCS^^2t{D zAhhnUrw{Ei*g0RWiM8~=(`75@Z#gekNvC8awq`*u)QbS8&IeY zQ+2y&TX$lx&mgL47u*ufz;3Y+Ez~yFDvqU1bd6c+@qrGZy~YhyW77J}J(E(THV`dQ zZ{4({hp0+TtEF}o^U|-XF^__oMvMN>vA73D>&PT+`aQp=l%iCdX(**z{=Oi&)Uhy? zWJ;>(z;qQYpt14CeW2v7h8PxqO-EJ+=zJV~=;;*pV`!p~zmVb1+YtJS*z?Ht`cqT@49+#Z$n z=Q@75n6qEzpl5u(ck-$38$P{#&Hw-a delta 5997 zcmc&&TTE0(82%jm6}*DnL{T7spn`~iSnH)4L_lP@#KlGsT};!Yrnae_ z=!q|ln${+5ld3$>zF{z?u@9}L4^7(`Yx>ZKrb#Qk*;f1gXD=-5vVHN`v-$VTnVB=^ zn}5FlGBYx68Trw2)e&Z^IC-M?%H3ORCS0dShr;T@*2klm4e6ulS%<>Upm=iq z=p$<+vq_n4nR9kV5_Lf$RGckARoDi@CNQWvrIOTL+w!al8LggL@s$C5r5{fdR{ZVI z0XYB%6)H9+dBubvZ$VEt);5$J(kKJe&_TeL0gg!3=)su%0J;EW8OsY)O~yA`6Fn8a z%7KJNRh^g@9$_N-#-tu4)LElv^s&UEqErng-c}nf=Bt6EMr+uNE~Ar4X{P8%j1dk= zgruki$@6!_pcD&9JIlYT!4I~rdBpB9f5rVb$Ul%jAb&#STYusHx0E3ky#EAuGLgD;BV{!C!K62`p33651mI?$93>7;GoT058(z(8$}g|oCq3+Kt7jT^N67S5Ei z)x3x7V=fDy;>nz8bIcy0hGdN3@J{#J%okjPcqcsMUS&zyFyh}UW3 zi#bx;J%^LWc1QA0=Ex{?_D*eVz{+Q$t}JKM`DAY7)niS`{85~Ga3OIlaU~y4(eB6N z<-M_-rhT8m`zpHdDIuJwXFC8mbQ-$rP&IY6f!JbHhiMq}T}OMV4oC~swaJ=!!zfq6 z6m#h%wE6mJKj(6%YZxyahmP_<@qBb!4UH934pmVh$|Wcjp`{3IIe4l4X%pbds>b6*mrRc!qusC=Qy)0tG8)2#rXwLf{Q7USEUIr%LjyaS= zmu|k)qqUPZd6u?@j$xri$Gw$gAsy{O^q4lQC81^o1LNb+5VZ2%_+~bR$+Boo4g5;e zQ&+dTbSoiYIKXY~y}X=DyUR?UI?7B_>L#)Qm@L&sEb1D4X=P!n^l~9e`S=MLa#Z)@ ztOdhVN?V~!C)Dm$suPOSIi@C}%3MOoy=XlIg|$L$PO$6{+MhP5MEOg@UN`BKg6q-) zj#OR^GRbCE{Y!;XH)1(SjMI+t*&^QKYNDe6+71rc!CHwyJ%HVdN#tS@{rEk7==lYO zMIQJ|-1y;kJ@|vdZU)voXZ79|h1paJCt6ohUir z%8djroLyZ!owY~~{O||B-_0uhTNs`C?n09GRUI#e&Bax6tyWRTiLR~Cbw4H`c~mE$ z_hS-WhV$2JdL_%e(Foa1s7b61;0mU&%T ziEWb6It-=YG_=@0>1byoV08f6J1?-)03EthXrEzVOBX_mW(vdw!{~MyX}Z(&hRtXY zd{LeppMvAtXl!SvK!-1#>lZtS){j!3?Je+WWQMV761U z*K)Y45<3eCXcEATRI)E`bh{ty=0no6B7mNH@Cv48BU1FKAm$@3&K^Rld0lYCTR@CK zgXu6sw>Tm3Q8+N%%7zZ%w*LRwO8eBA;s-JyB>;XsCs?H_R*q;@%qul}23xgbTX>PRcydlb*hR*M>C5T%y(>i`@KER#Z&mM3);LN(pwl-eJUu(S)Al(QOQ12O*1G%>x-Fgp?bFqIo3Z!z_*NWXlJ#vIL z>einfs2Rkt?gPLMoblG`hd|!G4o~0z=;6X}1Tx8~(CmZQsSH0m!dEjsRD<4f_S7G6 dPA4ba0=NPHJve2Oji+qgXX_s?N6J&f{0mZB8#4d^ diff --git a/Tactical/Inventory Choosing.cpp b/Tactical/Inventory Choosing.cpp index 0274e21d..5f667b1e 100644 --- a/Tactical/Inventory Choosing.cpp +++ b/Tactical/Inventory Choosing.cpp @@ -2460,7 +2460,8 @@ else uiItemClass = Item[ pp->Inv[ i ].usItem ].usItemClass; // We are allowed to change the object and it is not the first (nothing) object - if(! (pp->Inv[ i ].fFlags & OBJECT_NO_OVERWRITE ) && pp->Inv[ i ].usItem != 0) + //if(! (pp->Inv[ i ].fFlags & OBJECT_NO_OVERWRITE ) && pp->Inv[ i ].usItem != 0) + if( pp->Inv[ i ].usItem != 0) { // Weapon if( uiItemClass == IC_GUN)