From b701a71e23ec829900f0a69ff140c93954194e51 Mon Sep 17 00:00:00 2001 From: haydent Date: Sun, 25 May 2008 13:51:05 +0000 Subject: [PATCH] modified mp bobby rays to show inv. also disabled reinforcements in MP git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2199 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 1 + Laptop/AimMembers.cpp | 19 +++++++++++++++---- Laptop/mercs Files.cpp | Bin 27729 -> 57208 bytes Multiplayer/fresh_header.h | 2 +- Multiplayer/test_space.cpp | 4 ++-- Multiplayer/test_space.h | 1 - Res/Thumbs.db | Bin 6144 -> 0 bytes Strategic/mapscreen.cpp | 1 + 8 files changed, 20 insertions(+), 8 deletions(-) delete mode 100644 Res/Thumbs.db diff --git a/GameSettings.cpp b/GameSettings.cpp index 71d99ef94..13c68bb76 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -699,6 +699,7 @@ void LoadGameExternalOptions() gGameExternalOptions.gfAllowMilitiaGroups = iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_MILITIA_MOBILE_GROUPS",FALSE); gGameExternalOptions.gfmusttrainroaming = iniReader.ReadBoolean("JA2 Gameplay Settings","MUST_TRAIN_MOBILE_MILITIA",FALSE); gGameExternalOptions.gfAllowReinforcements = iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS",FALSE); + if(is_networked)gGameExternalOptions.gfAllowReinforcements = FALSE;//hayden gGameExternalOptions.gfAllowReinforcementsOnlyInCity = iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS_ONLY_IN_CITIES",FALSE); gGameExternalOptions.guiBaseQueenPoolIncrement = iniReader.ReadInteger("JA2 Gameplay Settings","QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL",60); diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp index d0c66fdb9..5b3ddb64c 100644 --- a/Laptop/AimMembers.cpp +++ b/Laptop/AimMembers.cpp @@ -48,6 +48,7 @@ #include "Strategic Town Loyalty.h" #include "connect.h" +#include "fresh_header.h" // //****** Defines ****** @@ -1217,14 +1218,24 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID) CHAR16 gzItemName[ SIZE_ITEM_NAME ]; UINT8 ubItemCount=0; // UINT16 gzTempItemName[ SIZE_ITEM_INFO ]; + HVOBJECT hWeaponBoxHandle; //if the mercs inventory has already been purchased, dont display the inventory if( gMercProfiles[ ubMercID ].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS ) return( TRUE ); + UINT16 wnameY = AIM_MEMBER_WEAPON_NAME_Y; + PosX = WEAPONBOX_X+3; // + 3 ( 1 to take care of the shadow, +2 to get past the weapon box border ) PosY = WEAPONBOX_Y; - PosX = WEAPONBOX_X+3; // + 3 ( 1 to take care of the shadow, +2 to get past the weapon box border ) + if(is_networked && guiCurrentLaptopMode == LAPTOP_MODE_MERC_FILES) + { + PosY-=30; + wnameY-=30; + + } + + for(i=0; i=nEEWK=#e;`JO)cWAU%WzZAdJ{||M|p8gJtTg7dSa=F+jZtDGN zv8Mm76f63>tk~mj&k+S_5}=uVho#?Q8TW2}a=cg+6&WhEmsDBkh=b4?A~pRkZX# zV;?8H8?8Amx@K9{49`Sod-}VR*4e$U>w=Zh@n!AruotAOuvpgKb~|^rQT#2fX+?kU z_qhHfD`O`k{oGG{+6Av`+V6od({)|Wg_|0ieRSQkrE7lbG4`hLZ1g=W{zDXbsC)Ww z#!X$juWO%(S6LsD>E(Fe!{WLq2+8qS-#^e5&UxMRz#5qUs0U9hCs;qx%m;~vfMxd# ztGfERX6c6eUfLD%Vx*mPK^$H@NRW6?f#5Io|3Tuvhe=Ypl&(r!lQs7%yFi{-uY8aw z2dV#{w2!)L9|{*h^l`DBWEr%NoQ?g|-F08HKFhALHJes3eKU~6znL`1<>Hbw%Z6mO z=@-7K`#G1cTbCZWUEGuQSuVEp`=9zjW+3@5Y1YGpLnP19SkJW2y*-|NTk~&7XKvNb zJ(zrZq4+ATU{!zDq-{UXzPXrv(|1;M>zaOV*Usx}+SVT9%57GOwp7Y<;IxbDt zac{DY-}T~wYuef6!~^+$%Ul&W>$h@;#l=pE5wqvJJ>BdMfmvq1E8JfZepfP>$0{xq zU-ZJNLlVDbRo2CdMvPJX-G$neVj2@2KO%MfVCKoggKU3@)(gn88)#f_O(Wxn(G!qO$lqOByQ zkV`o~KM@A;m-h5?Ag%r+*)5MH&mQUr-}q=EH!c>xpUeC?bjtJN+h7kr)~wSj_)_zK zF@Z^6If|WvOm2fh6LoN39sFFPf03daF5RIsFjd}D8%!@sdf1LmyPF)Qv+XAMt?wEx zCCzZ-1Q2b;#k?RIG;-SA%mbn)<6GipKZsk~D7HV1eI>5>daP|&&sW7CW~8~M^~?i8 zZCDCRIhRv!L8-dT4|JoieXd3^D0(LesB`Ha>5#|oy`+^xCWW~%PEZKiyO{V+Q{ zb2En9WIX%~`Kr7ud_QQ#ceg33 z`Lq7ZdG%|J{jq+r9_(GW2jFu!MEcBi@f7patvmMcyM~dwEaY4c;xmvfL9dv1UbX~t zItcmKO=(SYtjp%SSvyxycGJDFK9gO2G*&*=rYL|h){{hu(E_6RZo9oHw@!XHru{Z4 z+PscgA=0!9U(JQFhtR&7TN6M2Qi@8fi4M@{nV5(oyXcPXm=r9*x{W7hb>v~7qxey|4$UdA)9riU*g9{ z@|zBoh4?0E?YiqXb&bWlyRNjzaMx8HN4};}iNe>-JW$@kR(n@hkfk6ClaI{qu=MhFhw7nwrK%3;k}#yiqTzFKm5+>y_6St}#k zx|4SDv{+Kq0|=IFTBPw#8tc;x8^bi-eXW%B{-zcRj<4yN4Q9}|9p_PEX@cDDk1I*VpO5n%KbkdG3Ijl;gTGh zcqz=}9M9ey;*QV!HL&272V|c8kQ(m?UL z4Xyi6$pXaIrAmmrjD53H{8b}C_gC~f(!1cYfpk!L#m<$~0{{`Iik0X0Sd53-4=8V_ zkxh?M17NlR5(ztED7{^-E1>Rxd$^NVpaoQ#)_Pts*~>|KGxDC`3Fkc0KE9jUw`HQp z$5|fpw%~G8cUbJ+b}*1uCc=ADJb8VB9q8tnJ_qAKa~fvnHHzy`$LXiK+Q!MV0v3e` z${A?=*pHVL%f6-=mebC^*Urh!AC_iYDn4qMpSeC7TS38nW&{1ECw{87-rI~Nhp}UZ z%9|IW@>}{@N_B3L;h`R(x;KN&dC>{-{#*h4`eWAVeg3$sUuRzo?r1NE+R59?U9;jX z_Y&SdY~`!#i=$~D2BMPAv|#-;b&?92dQ`GAsDR7m)MxVCKb7zPsbYk@ z4s6YNJSuY!SD4%oUNH%d+W!9(e(vOC5OsmDb^-9E%_tYFKT7FvYsRp{PAN(8} zaZ^z;rv#_~jBe?(Z9(1YLArKQ#n(-Z^1a3f*3<#6iHE2%xiMbPtnnGw@kW=M$tukG zA+Ppc8goV+ud(0D!V{5Z_PMQ6!EBp(9_3?H-Bf9#J`VmP;DHB8SqOmNcHJT}YVz((EiG zjN_pyE!reZ(>?EkgsJ0&YUH!bWBnvd-MDW;!ZfYpG!n++JJaz>k5~H@ZoX}afKkT7+;&?I57Cx~k0d{bw?)Q$Njq)XE}P9t4Ba@j0hJSyu~=Foc6 zcFc-wN4%MZlzFpK#(j!eq)gL2?}C)^I8eWgpj$M36cv^$iw5LH?!=?Yp%;RT+{5F zNGFyW#|y8z{`KLQWGoNjQI?H>u5$d$-Y$LSsNj}oaaMl*B{U+7%&^h5aQRTrTM_Pt{b%pi$ z$~rDu(b!Nt+~K42&C>=i_ThG7CqIwlo+~N)6j|D#a;CS$mp>^U7VF6=_lo%Qe(@@; zk#n|IuTj6xh~iMyQ088bZ`(DN{j8S=WFPBRg{1B$87>K`M-B33Nij@L7GmX?cBO8O z$Rp!7%}W$KqP*ppCegO~(~68Z>s_X;$q}+Tj}a5wwmH^iV^dj3WP4qoay|8pL?T@_ z=6DE6H%|=2sFtw|q>@oD+)_E>V=_49`Jj<_juqw}ElI<4}0;p{cp0pm|n zHmHfZtJlv1#&*KX`^G@auaC~E`}slViphrc-~VR?70lc*56&i9za%;vNk$wCtjgc*4?I&kU+j)`g6oEp%H(!EY8>FzWSqsOp3EwKN6P$|$Ga*y zxvb0$GPzty?5Br*JFfj1q>SH-w129ThSFW%3AW#)ci-yo@5k>y5tgjhX)w`$XT>+= zJ%Q)u9eLIDMV$u&8lR~WdLFbv9KFDDSNF zFzJ5p*;Ky6EttH5&?}rgS9?Wz)@*&(iOc#Q>*6?hAL#ZSX*B#1A1}ND?7gu0npf_3 z(hF)`W3vOh+ASH+I&X<*@-w*j9ey|Vb96}>DZ@-}8aU0bpbql%`}t8h_rFipS(YgI zS&*i0OtKpFI8?Vap4&H`&u+TEoG)dDQR^wsbgGTwl7zZca0_*U3zH-B$5Czzcgfv)o){(H7GDi{g`9@o z^R<`Z#4N+a5&1Rra)Sn!1$pw^RPnlW8uGR(5pC;<$5PkN% z9~M}q(;jF0sVxPcUY+U?;&WsaF%PR>wd**0!KZxdnfSQds%L-(m9%v+W}{K`&uAj6 z@Q;}T44n-$a#}Qu`r7N`6J4*lwvpPAPHolm~uj(j7lX-6^y1eOIaU`HkK zkvPcciAw8X@r%SQAw7|F$i+M2G346!N#2=^K?i-LpEtRlO|1+c5dV+r6lCAqu&#iU zRbly=M|x7;)>=6kbbY*5mt1apdjE!;Q(Pw)Ceau<4xN8S!YL;iJnFfdtn4QK+0oVI z+B#yCIj^0JUfr&8x;05R5O(4$z)427agdYwNW-K>nx#a(OFK(aUP*b!Hw8PiXvE+> z_UBQ=KBp2m*Lh##l+W^v5_CD)XEvT|gmRqvu4>=zilVW(tWy7(IFA@J(J^99*!v-M z?YzL>^f^8DcJ)epnON8({ZD=2QnFaO`a^x%dR4VQO#9Vqn%|-i&2?9FZ?n!&cJ)2+ zt!d|o5W05cHR61)_uLUx%8k8B4{R)o@suna_Pcj6-y_(H|WYey@AFhW-w1YQr#MQKd@+a z%u)+Bp`S8M)Zx-~MDD$}(a1-MMwW{I=`nW55|gm_&Tct%`JsQ*>gi_?>*MbByFL?D z8>h#7NcBz4%4tCCM6(dV5W3D@>1=>KgP(k?_eef)RK36JIfVm#stIrA~*x zZ?;a|J{PtQwqAJQp^M*VAItS(ye@2=_r-JWXY16(vlq6`A|m6_oJB;YD{@yCks(5Y zB=y+HaMH1;niH@}5X-35X9ON8azeh0=*iPGBL7ELj=pnrW1=$+v6sE{pJ%D5rXhnn zl+PK@z2OedpTAJvGsY_CEy8YctF4bcHhUJU8q=v}vFfu%vAXb|@prAx(rPh)2Jp?- zeN($8b7_&Aa>N_ooV*lXx}E4YYmjk$?8wYT4QN2t-jPjxJf6YwUBr5~^|YZon!&p3 zP>H}h;#A&ohbKai8?$`Vwldm0Q-U?#OIH#pCJt|1^tsl??S|O&K6W%JvAHLSI(8Ma z_6irvscb4rx1*WJWjM4PDt3aL|HzkFmmoWrZe7!<@}wfFYDB$p$HH&R^tc*_+d&_1=nlk)TGf{7|(- zc8Aj)o#mYN{Ixx5Z1Y>3*CjG>b#w@MotOG${*mTGFIevtxRmah2DQKitAV43saOtH8mR4Qv5Zo zn6;y6IV+QA9jX#+HM ziAWXKhrEt77f%y?uF75dPk*5k&AxuOzj#VdJbTbqcSp1Ggs6{or$g26qjEn^PWA0? z$r)8TuX3gnJC!~-*qpXn<|#jw^gCIucACfLHBDi1wF+gPcI(pAt~2Q#Hg(=Z($7_u z&t>J9qDt5-|LRQhJ>}EBf_L$(RZxpjFg-Gze(Gw;s~kC;&}ZPAUJ6)GWe@n7KBHR8 z>)#&8lEJPpA8kKX351npqg83l)`)da4R)FSE@_1Fim80WdZ?}$YVn+X)q6L3jT0yC zXFIpg(uuIF$)hQKC6v!oFPWxSFhTn zP#f`9yd;kq;!)srnjFpR?S009zOBPPRfxz1JBQKL^}MAhZtiq}}H6i@?;O{A=(2ZFu(n*KL+c9adO{Stw0%z{f`e;j`x}avs17#V6-mqpds^ z?CbWC(8D|xG4_y4rob;cvVLu>+A0Qfn{HOg`M$|Fue|r@%w1`DdixSz$0{L`Y4MJw zNhFy_sY}}Fo__w#JyjsMm0$Nf;pjYAK5J^SJMN6R;#peY@?zo!KP^{&W;WmR$=B%` zr&1yoZJlakPC93rZvnT{hY2g6Oq$ib#fd%Z55S(S_b984b9s1A+=I{2b~evr2uAJG zvEXTWZJCB^nrlOAv(qrp{mxj99;MTg20PY#ODjZbd5x*Z<#~=fHK#nQ*>>$?{-|+X zK8HqdPD8_m+#tgKVq$mP7VU5{3SMmM^APY39JkRESg60po(Wa=U72R;uJDtHPr zEDqal7M^KZanoMj9+-8W}0JvAufnKxo5)sTy0%M#(XK$$S31>?^J5fgQaGJZUSW6 z;e5`BtV;KC=9K3T@~l6X0{!Nzo}F1}_bpjE<`sMxJlxkJ#+JoT#R~R*{rvy>ZQ^cT zr#~8z5_Gp`hB?zm+<|xsI@f5(T9q^H^&!&+m#>gwNtQ_6$fwiEJkC(rA))D^Y>T-MZCs)%044RS;_pa1-|{x@msxIKx@?r@AKRyA@leML30R}WSscA_2oy33Qy7tIbpN>*q?{YHQ{k13?t<19@vB0U9vZ^C2a*NdA*P4aTH^-BB zR2}UYS53pMozkn3BgaV_&AnaRfo+B-(6(adk~m-A#3Mw=&3E~QAYb3x(D^5?4E2-c z&f%Ph%uku)DY?{-IBd@CE-5U&!Jc?Z6wix7+gW_l9G8Z@u9DCfirF*FAt@35t zwZ@^V&P(O_^DBbGxW=!a7w-Xkr@vXE4LPKzA#hbt!n^E-m0$V3$g&)sCeQ4z zYv!;m%38u{x!UK-{)KimV)p=M1*Q0`31FCK%7H5ImPW21AY2 zMfKf`8mscv>mApd9TKw=7ca*liH2LP|B7hk-jw~aBJEC;1uMly>y`=*$B+pj!E=d_ z&t2vIP0=pr4v-w&<2|p86P>E_oxzz^E-#N_xt=nY`xW%Nv8So|tY^#f!SN2ybqU<`1eyG%aSM)p*b@Q~bdCO|zsGFi{o}Rd%=Ch*a9E0x?6&tnX*88mS4Lb#F z7Bm)zbqs~O=}NIbcY4O2rf0&{RPC|WO4D>@rdDR!s_YB4skq>a_PpshSA3K5` zC%glfU6fshcYO?`3ipVKlw&DxSJcBhh>s+p$-0bWi=BlHVztOOB(ZtN6VuPMm>&Wxzo3gp>i4*tE%&)Ypt##I`^Ksk@ zYRl_F3-hj_@mz5=BH+(K4T$*)$xb&}WmZ9!S7O++yzwQ;N)XGYD$=d-_A{t$c$tPL zC$T=!Z#-Lcq^wi5Q%Alw;JKFibuM{v(cxQI;db@}DghW$x(9`FOtv!sjC zl?g<=s<63U&?*X%IGk6$tI@8e4x;28exs2rTiRATSVsi`y=iFXXV2SeK7h=-3H5TF z8dO>BPv+d{wb>(K($1{UH9;O;iy^9JHJBfzPGw=JLQvyRu?x+9Tw5v@PhSVd?hVlEA{$xdTZX$+{fZ4 zJNLVnPV4&^RID4v5H%oE=N$y%f9jSzE=+B0{h3@Uv#b3#fS2{IvhF}T`agPtmd`iQ z2h?e$+>gpSv9x*M%;EckQ>)ST4Z*;%eX@C|0>@%H7UkpdlT)JOZ{@*<8=^24=@F^v6?gp+H{g zQ04MBW4A$#&`U=+I<7^1qrl(9(8+^@ktMVMU^xTi@ng#U$p+O^lQ12^4*(SITi|ar&ygl=Q*E? z9$lOt;3*o`cg*`0hfUCBIl$)!+6}S=Z3~4`LrWk2Cwgan6im|nTft9t2M#^6KAJqb zdj0}}?Y>%mGK;l>J1imV--5^DPlLHApDtt@lG!>y_-SeE4tUVk>vna$|H*30Cq}~C z-AHvf#H}vKUk+Ol8`H1CmU6lZsyZv0a!Klv8JY?|J&*VL`rI0}nhSb*5Q~Fm?X=`w z(G|~e!T-Ll(aw%K`&zXFVUIITXuOl-4qoK64RNbF3_)QJ#R13$G^|k&T_~{u$TB&# z&%SQEGpK>NupytOJ)yVJ+;HGC%|^Eo?3ai7cCYw%y@S$^wF0>G)5$u3g`JNc35)b+ zJCZ$#CB(S9DI(x&j=2Zve*b(RsBr#zOLtkVkJ+-ef8^gSt%cdK8%9a`9cp~I*C~p6 zGp9LZRaIN?nORA9)9Uuqd~QYGOgmoEYPqhen?jnoj4_+Y_Wnw%BFc&dK`q`$5P7Nf zR{L*9~=2g)T-P=@;#PPrvr8Dq`rD#JBdmEQ@3CbOSrf_`W`O*KFyt zjYPe^7>~=J1rIn6c+4wa=fMq&C)Ia7`xk%aNI%#fx222i6rJVMPIm9~Q#M0?hTgm? z>E^ix>#X4aP3uyBhCT5_YVEO3@IQ0iibYb+R~h|SH}IXYC+K5iFJn*rq`S`I`P}*L zs;e{^=6lM&%{?Bsd0kSJVU*v+&ijmMBlU$!wMXPY8ayyoKfmKA|Ms+dY9G@m>;D1R Cb3Kay literal 27729 zcmeHQd2`!Fvj3Z|@^_f^CSKa6Maf5!eH*6=BtZ!=NiaMtYaJI0B0&i;32+I}wl;b1 zv%g>W41mEwiISbz-i=d{1z?Vz?w+1L$Mw26HhMi%JQm+i&mI5Fory45x?r2;EGB z1vlW2TDPUUo`$0BE!?p5Q~u>R@)lm?6BzTk?R!RZy#*whM{v-fU6z&QGReq!lCoF(0b&)FSH)6fN$~BCWwl}=x!E~CpuuJ z4dxbypuo8|6-2xO&VSmtVN`f)grRrlFI~U*$?{j50yM6Fw(!F9{F3IL@Ay*%;9p&T z=FM;4B9@NX7F^?~DbknI!1vv$oP(Q#|FIb=m99BxHY~f1O;FMP+-X=nV{p`lg<$xHD- z8~}US$xHg5l=MF~8#KlVjqz=f0&Syds(BSh5Pwce1}7*U6@Z}ba@s4p69DDikFD0| zNcF~F2m8gP(kw@&b$FDr{J|rPRse@_DoK|jw6X=GPp;~&7Pbu|Cj>zG7_>t*0C>}v zBK7j_F=n$1&`J9ADS=S03;TKbP&jg5Od8|S$nGgRd&BA4b^T*+7Mit+CY`J$_U<+j#w89jzTNY6S29p}!wSP^R-Qp$z9=k&fJUrY<_u z0mz47V-rPzAIfKbGdg!+iMemZDSx_s>uuo8L?iO4JAIH{n$BWz>P+8M56700sN()< z@b6{dOgrPXToo-#j%O`lvna>}!O(;CQwjrpxG@ZAXML_CZ|#=OMIUZF zSK3*hs{y2y&c)_9eZBF7Yy>3(@T5f2`hS!qvjLh}o9L$<;Et2M1yO3GEv}p_k z&rXgF!ahAzw?JX~&gsI%;PhA0i}-{1)C)GDq(hYDFUWBIFsC)A!wqxYB7tUGuES?+2k}-lUIk3AV ztuR65(2csCLt2iH^;LyF2JcV$R1;_;jXmh=jGRjI$ZS4uSK&H&;mzDYE~t7}>t7Rh zvDITqb+2SSv2^>mONtlM4%Ur+zj{a71wa2B&juN}7e?NlTKQrL&Yf4Mjajz9Q!n^q z)+R;&M_ZO0POV5XA)gOGT_VSFa=h|P&?c7~h&d<4e8W4F??VOQ!-Lv>4L=U>L+v#_ z?UJKLJQI?EEx3pvILI#+@6GJ_0p280C?!6;_k{& z823pZu?IELGTX+uGnx#KjFx?TSs#4v?beG={^pP4;mB%RW~+2i!KwS!OzFy!s{(itY>vB@xu{^jE{OiBfvVJao^C2e_gcG1VUoLw@yIGegw*a56m$yz-aDwFWrb_WcLo^-xWO?Ws z9Uax$v$O;T?lO3*Oy=BSzNJAbytgz+x9gS$S(=a2 zWSX}J6bfvN+ieq?sor-A+d&fnwjP{d1GCpWsrAO4 zjyk`w2IimL7LZ}Jn?av?(6ahV`hHiqmGyNs+EcEt+ze*&&~hZ}!9fPy@%tSiR&Ecr z^_S#k5OetM0KeuBA#Yw)kl9XVPm9C?k=|IZoeSE1r^vYAPb4eEy?ATX>+#_9F%&&m z`!q0Emu#z1Amd%tGy1HuGQwBanCJE0ziCXheCadRAAo{={h16g{aKk?dQ`a4VUwh7 zbcQf#I%az`No=NsJIUx2u^bzMv&z3#a$am?L57%|%tHuHTD8V~7Bu zfY+x|Q7<1p6Ai1~rnV{%NBeT{^obM@1S5=Cjf&v7WZ+~eF@?z0L*s|+@bTcQm|}db zckC0}c`YdyOeuLsM1crhS73SZT*3>*4EZkfE({2nEGR_~B@DG2;4@fG5^k|^X> z#Uh0xS4i{;H{pu3i&-s0pHt$+4c zU1zPl-C@gHN03>p!N^1R`1lyI2hPpq$cw-r&RTu8{I|}+o57=e1d06 z@N|s9;AAqejpk8fJm~QnE}3&aaOnV+M=uc^=Mz~7DNI*wzsmJD;OD_R%sjg>kPS)M zg)i4kgygOa@p&v2t5jlz&5MTgu%mr{b_6? zZ2@Ul=AcIj3^uGW*iDnClYYlIF$WX-7+K=7Z2_=kj#KzZytnR*T_&&{hnv%(7ZF(O zJ8N>9JyIhOE=4MC-#AS4Fh0InM`XJ+f>H>4pHl`=Y(Mit604O=Q}$NVexrvQ7|GHe zB;;HVl{a4|bl@;@)={!35jl%Do_|IeLqsR(^pw1TmEp^^*A^dqnCsXTzih&Y@dy_V zyF3&>%zwlO!rjcE8R-9*Le$*=x^tEDj9xH+oaUlFMEEzbQa$vdkI?M}-w2cwfdxuUY^hwt{`Khd6lVM6L-E2zutc|Q#n*I zyVQ~?*pa3s;O(3Qn9G<`)9E86senAkuDO5lc1cs?5MJS!2791cO(|ojboVebCBqOu zUml>*d&XQuiQP#ki5_;0#*}!+Ya%>%X2Cl?TjoSJ98r9371(pc9Ql>TP4SXGmmZ7{)G#g~Uvgjams z=!_A!NkZOOIrh~VDyc|m;zb3V21_3bLM2^Ffd}M3RFXvl5d~JrOvectYr!-&H9|6p z%uAKxme

>X@StlS({?^?E6D{!#oE$9JfRdgacB5vf;I)=Xvjp$eAq!^s2wkVJDc zr389Iu1cwiM>WBTkFxf)CJvrFMJsS+K5vqTwT8%2Hd?P`r?~1h8;xt4J!s?EcpPa6 zKzpJECwvW~q1~}53*x+=1<@NIa~aY6NHX*-3P^aa&xq))PtlBHcaWwf?g;qoy^v+6?|q}u33%Y}M~ znsb$IKmHTzh;Q7QH5et;`i=#8YvdI2SxBKr&;W9yNbPywKQR+63 z`O&EEyaSz4@ZaJ+HXq8%aitKW>S}Ezk^iexrWy(#FF-G^T-&W$Q<^-`{>mZWo(k=i{eDC z>{&=ags z(243Jz_bJ!EFdZ~VqnyPPorkbWmy<1GrmN}q7Jf3S{s31z*5hLvn=V~HEYSqC99m=jrih!5gz#dGG9#VL z9mzubuPH@G#^Qek*v0g-R4G;Z72j2Xfvu5c_Y5eAsGJtqM!d*ub#{F8X5WH*ao$;a zL5u3IUBPmhuA9v~lj_uEN?`&37oq22`j|9(k)B4vU=Z!%C`;Ytj4L8;fh+10+Q_xE;(qV`cf*+`zpRHt%@ob#YbzT>{BHB2#I;b4`qA;zN zcqOu9o@NnJV2}^Oato)CyS@gVTaX4O)#!aum`;}YDRB(}guBSjsqlFx*#XbE**hE^ zeNmW}i;T`cC89ep5#f$F_g1^28dn3*wS`Ak|BFI)y3kLF?qe^U1udr6ET{rQ)5hXX5J+7YuF9GT93yMq%rhL}B}gthS7k*KFP= z8)Qx#%#uC)~}}AYK%$FFO`W}g5qn`7re8XM#N8afm-Esz!wHI zkv6N|J$^(ryHxD>OnKXv?h-i=)w|gt*xea=|8|49%pTBYOY?A4G!QAZ;*E>YACgFd zcRpq(XYJYixqHC@=U1S|2+?>D201@Sy&X*W?+NR|sLe~`^vE4m2^mW)hcYovUCxtI z0i?=yHq8W&C9~PjY1x}5B0h7Qh$`*KGS15$-RTQ4)bQPN;2jmFg4x1kFIC) z#^%EO*T!4X?ew54-CtSRv2$8Rm+Rn-0%SEe!31k0qDZ-q$w-uAbmaZXi>fGTSkDy( z`+%h>HOE;Op$Lb_NeR|;*qq6_WX>v9Z~sxRA3P?$%z>hMos{-EDd{jDhc52=pTY6| z&%k$a!JSG<#t2&%yzwYcd4ybN;!?=~Av&n6WinapbBj^_#tLMoFYWXuSpJZ`Bf z2?#uh5B;Fi=v5WDQ%wf5>UEW{BDk*Q(Z0GS0T~UHxe&Py`OQdHYv(6r6s5;5Zo3;y z4!&clIF#8H=^1t%OcB3w_M9AC>b-o{LJY%maWd(fHhe}&k^i;OnZ+g+MYu|GbGELo zjXVRor2vh8#s3gz^Z1U}IrMmUMlZLHo%Z6ogkU}wez3$p?6DAY*Zm(L{bJ_&e32mZ zhYW|_6Erf zETX%fU%dwwlS)q#%~V$;yu)p%n<@Umk@;p3CuAo%YuYMFEXHS5qO|FCxU94lFO~YU z7+3NfHq&l*82ll{xYt*rZlv)L|9loVEbz9ct$#Hc{!{8z<(+7|U(}q`#TV{A+Py%# ua1%;eoG;}LNnTyA-hdjUnW97t;12+gF z4}cSMKENsfKR^J$(f>#O{XF0R1%Y1(v=*{}j)QA36b_>O^CAgm%y+N+u{QigbFImi zgCVpA1QO`C3xBJm{TFqAwwN2@LU8)$tVNvb&$cTQ`c~5%@&s0ULIJ=FzCYXePxVB= zD#+>gyZlM@mq}xwIq{d;zpwb-H|P3yTXSN@@f{~7|K0PC0(vw+5WsOACw$-)0AT>4 z05O0#Kms5MkOD{pWB{^&)qphsIeFPjh0*nFBc>sPOOb03>2< zX=Mo^5D4fO@Ppu9$Q(j)adG}YxWS)i6%P+LH;(`xAMYx(02+-FK%oSML`4LJFhVGl zh@=QcOk6@j0xc{hEh#Q7DlQ?;xd{RZ+Hmvm^YHMC3!((Y|F*y{APCzfeIzy2}K~0T-->`s6p*0poh3IJfe!)J9x$R zdGf70DXw!iF@2SiSz)z=L))yf?vdaaegR1-X&G6S^&2*-Zo=y68yFgGG2dxnxofwT z_5K5nPR<8i4taU|9QF0{KXxi4^mG_L{LH!Y7cRzLx*V5uJ^9AXlv}s&+|PKB`7rBI z_T#5T#U-U><<@ zz_e$dnTnG7qkueqWVJWz@jX**gSKP>>Mm3PU`$U6q32*fZVL z-o>SHd-N!bdVc$RzvK>NW}^|_Ys8uama`V@SocHhdWr@&;oGfCws^OBeDE*pIdS9R zihA3VO;tDx>8RF9oe^hbb8pgtZn-r=p_kn{PA1qiK96EH=&3jHTzZ}%-hG3-B<3CI z*j{YJqzyHj*6Ignt7P=MG@QsPvV2*8KIBc6;jq55mlX^N^4ue|6q6X(cGIQJ<)-g( z)Uf#I%~k}3T4A(*m1v56VHu6@;!x2GEBTqdsm2*<&#n@KQVBZ0h$xiQ-MUW=Yt?bN zZ#gAB%oRbn5H_efmRPf5eK6DT*k?*ge&t8m=v3K=0PL3#(g?#vKJ z3{^k84MUBgJxj5@bK+H=3(TBGmxZG+G_njsFQs5eIWWMKxdN)(u7#nR9exV)(;L`= z*cP@;23r=j9fnB$rnCMJ33KkJtNa(3*^xEVOAhS5w=gvJ{SJ~K8ZBhz?YnkNtmIi3 z+D0J^wC{nT;fiq+HJX|=%{y@yg!5mo{^aud7{?pQJ~s}_D7(Lm?6uy}Iou8}_>&bb}$S<>rkC9%af{YvXSA zi`j%MA07(%v{%DY@^nzdRKCmX3bn3JL%yQYblJk+y(D}jKgahz{#9k8yY zQWoV2y6bWR(e@<@;M}(W&e1ItIA8c6O$)li#gz8ssA&vH|5Symnu#w;j%)ucnfxQ)d?!PSes-2FVfx z+}4ks_a_XTWuxxhl+$l}fbR-#^f~HqBz5G1cjV6Z`;tE{$>rkGG-)kyCBm}f9<$f_ z&4RF0)FJFsk0!(Nvw=>6x!!%gacc!c>f(NxKh!{tO{mn1l1RuK;+gGA4-MBQ)hwSs zWs%LRD>4(lT6MjPLd12&&9yg=yOPv4)j7W$RB4&%NY4LQ8d+HJv?^P3XWpk>0zPfq%1f@-G&ro7 zpfIHoF1hkPqN*0jJ2YQE)W;dV+eX!#Bwu7YW-_SN6&{zdHl#AYin{ZM;^SLxwk@^V zNGBQe4Css;T%*P9drdG}k+JAB>$YHTQXyDEirbug|BA65=4njsyToio50x4Td#yKo z$Pt!448=r5T5dC9rA!q+%SxM=sV;Mtmq`kDf*x*kR4&=6^;_OZPjjG{C^9I1{`$N@ z=8XgPHQhB>cDwULMQ@nXCT-)6%(n4eceZ|7GzTSdwOt1d;+PV|Wqw;2dSIZJHF`Bf zFaEJ%kR(G>fi9W~L%Z{FS*V~qdl)K6h9P=+iu8LMipO;$7?Q#7s8Sp!Nknc;$*_$I zdrRq>tr@+9?(wONKHA(wK0Y=5LHDY6Xu(BOUp0bE^jkuSUENt~PK4SEn^z=siCkdd z)ZyI$1^2DgvxK?lYUMIi4zItKj#3VWgx;`tDQk#w_gWYKc4>C@MdGRMdMpCN1qS5 z99KWSwy-$yFhvokZ0v5*i%T2}GK(A%no$>EU1Csa5q1oP*)e;XEnU0MMod}qv~bAH z(TOm_141luL5h*%X-tFCCL{N(IUA~G!Vy+_l|~Ofwjo+AywW%@GRYl(NL41iqDV^K z^Qje8yVy^OOL6V?=C_&VMFO9f^QF|Xru?n4GtK#$DT1SJ|4^ z=+*>O1lE4A!cvrOF;lenzFpOF&3RLPZItnB%R-HU2n-!7IM;`s#S_qY>mka_-s?3^ zSEPPVLPemmqwO&#=XV_y;qlN2{9UmZ`#73THY|K*N^d47=99cE^JJVeRf8W)=cnSb z`m3@o)ZS9B9&;$TYsK<;-{|fim4A~YSUT=?t8c4cpU&1zS$F$7(r{S_0fWjFm&sD|FXp? z_k)&IW#;TEa~QI@6x^c&Lum4P$wl7Y`YQEnUctvsJmJfdbSi0up;xY_V8{fxw91ar ztv)O)%^X-#6eiKQsjjW2H;-GAdKA9!&M#;_4LHDG9!`U+7Q zbZeXI4c}*PCf`VWBdec4=3`RjulRyn8%ukCISipPBPyUZyYK6%*Bg za&@LfAo}LQVs}OSmzCb!U-`6Aw}&xB8++Wh2j({YmiuyLPv3@TX;Se?Yx6U$1WvtP z?h@kMe$xD%HnTFV^Y{8p=}uB{cJA{RF1~LUGu~43oIY&z19mn(#}2D6rP0I7<&Kqp zZL&*O$gJh|4CT@8C0fBbK9*@SST~#{^am#obey9Sd5Oz}uZxCS4sUbG|(A5Zndo3Y>u)KeZ zUp+mYEzRCtG$vp&=vYRyHXvFLR>p^;zIuDJ#p<{@KgE$6_TFl~pSak;wHb>`mhX=CTelM4ivQh9!*7{LvE1a!Y4 zEW7QQsPD*P%S7+7wJK%w*L{GYCMIW?JFcDSB#GmLYMrVyy7H$&tU__NW`3VVUHu1a zZ^dkkdy=%%xCmpyrB!ox7(FvZmV}|!^eFJ1=R{yeSDZpi8cdda@H^oDE>Mpj+kX96 zvzoB56S45Z#4exC(}#VCIz*iu81iA1u`i%zm;yyGM5Pn{OZH3k7xgd}vIBhhY+zfm zyJDG4BAc81wvgOM)N&;J&?WJQd`d@QKV5h~*z1#)_)5}&FOWdV3&h;%i%-_DvMpdH{`KnHAMcY-qk xGjKMb0ZzJ%K*|WDu%J{6Xf;6I0Mz7Yb-=lS;n%!2DB1ZnZw69P;I99E@(&OBH8KDI diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 27caab7d8..e8ed779f9 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -6151,6 +6151,7 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent ) case '0': SelectAllCharactersInSquad( 9 ); // internal squad #s start at 0 + if(is_networked)test_func2(); break; case '!':