From 335d52614fd9d9b81d49f794bbc2cac065168412 Mon Sep 17 00:00:00 2001 From: mauzus Date: Wed, 21 May 2008 08:45:21 +0000 Subject: [PATCH] resource stuff: added back auto-hold and changed "disable lrud" to "allow lrud" on input dialog. other minor design changes in res.rc --- src/drivers/win/config.cpp | 4 ++-- src/drivers/win/input.cpp | 15 ++++++--------- src/drivers/win/res.rc | Bin 147940 -> 145658 bytes src/drivers/win/resource.h | 30 ++++++++++-------------------- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/src/drivers/win/config.cpp b/src/drivers/win/config.cpp index c41360b1..3ae53fcb 100644 --- a/src/drivers/win/config.cpp +++ b/src/drivers/win/config.cpp @@ -40,7 +40,7 @@ extern int autoHoldKey, autoHoldClearKey; extern int frame_display; extern int input_display; extern char *BasicBotDir; -extern int disableUDLR; +extern int allowUDLR; //window positions: extern int ChtPosX,ChtPosY; @@ -173,7 +173,7 @@ static CFGSTRUCT fceuconfig[] = { AC(MemWatchLoadOnStart), AC(MemWatchLoadFileOnStart), - AC(disableUDLR), + AC(allowUDLR), //window positions AC(ChtPosX), diff --git a/src/drivers/win/input.cpp b/src/drivers/win/input.cpp index 9acd4490..7934151e 100644 --- a/src/drivers/win/input.cpp +++ b/src/drivers/win/input.cpp @@ -136,7 +136,7 @@ static int DIPS=0; //#define KEY(__a) keys_nr[MKK(__a)] int cidisabled=0; -int disableUDLR=0; +int allowUDLR=1; #define MK(x) {{BUTTC_KEYBOARD},{0},{MKK(x)},1} #define MC(x) {{BUTTC_KEYBOARD},{0},{x},1} @@ -222,7 +222,7 @@ void UpdateGamepad() JS|=(1<pa9TSk7}GIN!6Th}$$Sl2ak>-V|$zV9%D^xJ)&@Au(h?*DVo zJ?GqW&pGeCXCA-t>Nn=b(*73Hc+>c`OU5zF+83r#Ws0^@RqN1I-nXvrK{HMFV#q`8K{L#w23Sn#rfH^I0WgP7`)MO6 z^#;wt^Tq}8R{v;z(p(_Z;u{NPdg{ix)HFy-;5!FI@r{-unT8E0GAip(5yMNYsv+FZ z!Y^2JjYcQmHZWU`2=^;6Dx>%@zd}`L8XC(aC!wdYgkYBDw=MAor4c7+i*a-aFf_?bg0R?@6qcV(YLXId5#RO51{SWI1|x9?}@TWq7VEhli;8 z^&zSpFd~PSjHv1xHA|?~&4Yr_Ty%`#ouO)if{}rI=fEi5I5JcMJ~q-#%m99MkRM+a z7D-J3S}4zpu<_V%E6*BJ?9Oi*W#kvT>pH{p-1&K<^N~;D7e~)S+Q7Ranq;}{CN(ZK zvRw8}jkNOmh;$xvv%k9>dXt@>x+%6_oXNpwM~vsbQDw5NRZmmLl!1N$eBT&fnF?gT z8WYijY(exwIpBg!9em9#3uHMgM%C}u)10vj-GDmB)+uHPk=z|y(icI856FP%mq7II z(?v*hZWyQY+*T;rT5nsxyKU9Ha(pf24bWnExE*u}O5)q?d3`}0!EJGBs|fZ~#pNhG zG{^E0y+jy0PKq*8wev@N@8%5CBGY_R8Fuu2?#+2`{50{)lD&vkxvAiO=T-N!el<>-wdED`?oo}CS<^Gex(Y^)$ zE*_9t&TCVb^V-)PJa%#d54g=n_BG6hYV4Z1`DNzIH&0ICU6U80S1j3Yf`)3mgxb|< zqSnSQr6uw1T@GF{C4sax%)t*&iIT{Lr@N?W0G7BqJx5}bw%>=Fr>?;&VtM;i2bEl5 zG1Pbjup%>@)bu<{;msKl3ds2kP~jsRFPwJ#MmG=ml+0T}+UdOUoeV+V=24mtx8EAn zo5XzSv*Y-@Rtw*EYdA0INNIkR`S9@RVZhhHE2lg8&LSH>Ha!VzT}T~HX6H4B%zW2v z4&HI7iC1O$3v{V%jOND=WED{7r|6M0BZ+tBXYr#mf;|xWZiYZe@j7^>Qy{`Co(%Hj zw?yX1%nTrs#~0>=$Yt%!*#ssp1VSykWZ5-4g|skCy=8V1 z@0yKWKg&kp-(o2>c`n)GY@QGm8_%DU!kgxl;6I(a@|{RC`L6s>;4A7f`O4eFWZH#P zD_9`&+Y3}(;7?Rqg*3eg-1|ue4=5~^B-&c&;$4NysL6-f$lnP@)!&gSThd;(@{^$! z?q6ibsB+X*VpJ^8yK}ni%@5s~!JGcAkII-^18oq(?HA_ql)FL(yBUf-lVSRaDV^`% zIEq*AG4pkI1-a>2Q*618v9muK oLXeYq(cNLXKwJ2(yTiSpW}0T`P%ZPq4Tw$i zQ?3Je`pwDw?fD@R`LzAM+){FsS|dSp|9f1#vckq!+!M(=P9*T7_k_rD*n&uzR_f`2 z1yQmbdap_=_4J^ghLuK1flvF=!dI4t$b7{{Uw)`GOy+~`iN`5%9nlCJ){V5PEXU8t8%lR zp4Zd1O}>2k!_bYub^XJ!dg{lu6*?JKsJd+{)G94MRdDA0G)As#uU_`A!rZ`rVO5MG zOGj0#>=5>|SP$)S$IoUPvdL>!0(2kRHz;bLHZy;FUDBXLASq{6_(`B2QH9->6Yt|Y6&8$-~_cXxDlNbny#+-^c z#+;|$Oy&j6LBm{9281k#Rk|5VakC(^Z#RbyQ=)X8$ndyH;5O4tQ!Z$dhxLecD9ZOhlBi8ia!4Yfffzx|cLSf=q ziCbbChmE-ea;~~@E}3kMA=p3T&gkcOJ5$mF?g`3GPZ+9bH&E65voZ|CYySES^nC_+uaB4@n68* z@pe(UFgnUM1u1J_*Crb*;3OXQ%OGh?rG4qgEA+guWXt|w<{iHbmTl%1Wlqf1)3%l< zkMsS{EmJYA+kNAQUyxJx=`qb~jiSyFEu9}~4Hk#JjR*Yd0OfrP2h+N_m^waYF*rzJ zQEaXejw#Q5vBG1fk6#osmGXUU>EfiOlmO<(Pi^tTN&~siOX8e&N6)a@$$Y^}Ayl#v zz<0j1K)S+NTZ5&$*o?ID*;syJtCI)3ypp=F0F`|&$D)wLqh85Hr&zxEm2jDMBNc8? z+OHF&xwqxlVo(wf+NS!g+ZIN7PUhrix4~Ng)Rb499#}v6>TPbeY}y{o_iT^44$;`x zbVRFOtM?c>v~7yVf^FAvbm@-2N>_2s&U&sLwDaTp5CD1IhNWhSWj5^!kv@C7%a`Zu zN&{~2g?HKD*e~X-AJ};P8|k33jeq}!OOgI!nh!7CUBo+fmts8p^xwc;L42U`R+#%+ zf8&&u);*r9o3&?_zPb=z^=8y{D4u@v4oSR)dmAOH(QhS5oEqOks6eph@>_7Q5!EPs zdxHuv{1(&&wf%o(=4*bNA=#$wLj(hL_SHVT;SDpd)XQo6{rH)E5F){y{h89y-n&16 zcki#kzmsom&+(vU|91p6dj$2|JManmF!bhkETYyN2*lNn1o)y0JV3nou9vJMRN=?V ztQHo*<95V(an%S`guUMrtf+Zk1uHt=SHX&e1BeYA*eiK3_k#@Zq!?_hKma3~w;zNb zfMr=fgisl#+u(tufz*q zp&VQv1;3v6Q4v!NTI%6k^+)pZH{^BQ#W&hQkh(v*p+dj4M z@K1{c1w|oNWiEbV(N#be^7a) zt(1?w=MRS8?Z<;ZQ|)aneta?VwVz2Jx#@G&B@b!G2^-&{r&skf=Xj(CmX96paptyu zab4I?YMGQ10FJm_%?WVhgmT2wzEraqsW9I!Q zd)%f|fBX@b1UhchDY?n1rX0Rv_o-YFpy4OZATDvbMlvL(Yn_y!^IdkCX8kEfN7sjM z`BNqZJONP;J=3TdRdL$Nzd9qf5Tav$UMYKC`Ewd|uESm}`)aEMk^UDu<$Z)1dP;gq(Qe0cT0%7yDoC;HatVc#z>;Lu0{$S%^R<(^4Y5qifR|r%slnGeA%h} zyC`zZ0-=Mhm8cNh)@vD}n~icC06hHP6(GY-Ns49PuNGryCBv!c`T=KBEe5XoLFy4Y zGD)13dhK&I2F0Ej`&<>9r{aJX#xf*t#PArE6GNzru`tp!wov@oXoH4$uHa=%mzDhc zF{yiG;X*&wDqt;EtH_;WCVPM8rphKUA8qwz1#)4zFZz)E28LiQFiy>9W@@>CIn}(H z89@M{fT_d`9fD{o?KOj}A`^0>o~bf2$3;e9)cBS!rCXTzP9m8|Ap=+_?|L(pmJeVd zB51u@ts%?GQq)YltSnm9SqG|h(ei<;L!xTfcC^xuCH2S{z3<0*6jx2LZ~r-_(fEo1 z{omW-q1pcI1&@(zFq<$iLHdN@Fpuq~c*Gp;qius(m0`|=P+RyDh7_Z~h%IUZtm!yq0BPmN2ES^gu>Yf zS$XqaNRAQpQMmUZ`pJ|!l9}ZK`jC8DGg6u|$b?9}=HDQn{E0 z&6PyENhij}0d=Kil+^Yi^vNud)^@TXH})DR_#-q|-{StlXqHSTM?oYE+Ie&Q^z1mY zg}WuDx5SI#*pFfc1N+`G4+xMMPaJwny#ykd)dQrL*3y8lhV>Au)V6A%DtVUh?qpBlk_T> zk&>=SRF$e%ok=yS8Yb&iS0)=(t!a9dbqdT!b*(@m8bF7puu!$Gh;)`ECk)$w1-7KK z>2iVcB18C8ECn&8Bw9ZeHl?J4IRo76jL~egJcAX>k=iscT{iBV207SSWT&i5qv~oV zTZn}^sQFfwA=|9e*<96q^K_OgtDQl>uyj=Hnza`r89SX zHWtnEYP>WLuzUK}%|}s+!=?EkvTRsWA~fA3I9QUsV~Vk+~~n7>ZR$3Rm-nA$TEnAXpthTUHpm7exz2{}e)mbHPrV ze~R5JbA?q#9dti^RB~hRyYGCEuxG?r1UFjMv8h;DQoveC82nF!?BXj2`l6v3btscB9<0j8&aZKJwX zvK_Jb2Ye~!NvLF@hz>l7W|3LA8W{og$a5fA;8TzZ;|7=y)jtJ&iVGvSrTRR0vS|%= zsJQ8HxC0nio(8Su-Gk*%vnVR5X9;xlX#^jTbCIhat~qigQV(3JM~GDr9nlFZwfbmmO+-HESOb_Wb90|Ha$U$tY%6X7Mamk1lA%yezPNnbn9u97Vl?9U-R0jYit? zijsQD{54x4*?0ceY^AiknzsSbj&0yZ#H%2TU~T)WtXgKuw!>@?Job4F8wHJ*pA%H4`7FNDLt!x9caKVxewXp;bjt<)4Hid&IW+$Y+kBu$AJs#N!ba9!Ia$ZLO z4B=Wjkf`O5wu=RdY2+%3lC)S_whQDGHQ}{Bv}YG20M@XBHYICOl=cQV+Lf$1Y5g0x zS0m6n@dmgj^g+sQRwfs9Y&W*JSk(46u_s%90}Iq$D&FH+3VE}qR4;jr5U4+`*b5qn zAzgdfItg;~TOe<3qKz`&#tsnEf^ufs`!<$>U@3+Dmf1b1a@TK}I~Y#Y`@r!&s3Kic zirNoJ?mmhA*|1*-YCJ^z?0$xu!?PSz-VXRuS+#?BBJ+I=e1&W6n0wwk4BrHIIB45D z7}E6)d)rV|8G>NA@vL9er0ws*WYFGYB_0?)_@0|@xF5XIOzYl_^TIKnr20d0o_{T^~SHv1#q(dk~6I<|^E|sdQluV8`JL##yT7-;%KtWjx}lHai+k5&BccT9XD%b~f4S&@uM9zG1Q zaO?`2iGfa{G8QY?uhkPy$DFL(fa|FUWKF3)m zG0Q#9ma8sTjvHNSzR=I5!(RZ1>}ES*bUSv!=vMrt-tCnyjc(SHMz>ujRkwu_o7I2B zPL+Vp{}GfZIR$@DViR&&!Qe$71X9&$fpethpp&Tf;OBrYX(r^*wsG1r$Nk++*}p|$-nQoK>3 z6Mx6n@_3~5pPx0*zb;D6>LDSa-S|+{hlI#Or>z^BRB+e+5BQBzne6%pWafIU6>|v$ zGgOfjDsk|c>FOnP7izZTpHeB?=*&MM5kk3^U4{iE4W6r)p}Jx4q|n@dL4_GHfW4xi z>oYlfgSfZ>Bm7&a8{8hI6T;~ix9e&8RjF8QwCyTvb76BPd>8B4UQ$QDtPcMkKDa=0@Aoj10)AktP=X=+11owiLM#1Wi1HUq zoA@IV=LZ>b_4&Mq z8Y~*Fx8Nz9nB*9`%LhKijkN z5Q?tvVM$p;-ZKR~<$pAT8 zKJRi93h(3Yw$i>KTA$DQhEqbIhWBHN#CTAMaAu%ZET=_baJIY&D{jPQ;__#i>0Wv| zP#aCTLp4WVG^S{STVIdk0FM03GmllU;rQ)($p}3Dj zD@Nc2U+wEoKJTm#eKbO|OI;Eh3VDY6=b$yASXf7>)+#Sz;pGu+8mZYl&f+gdUXQHs z*Mw>H?`EmmWr>YFvEk@2Oo zH)|>gmmLL|!e-hQg&ipFpVb`lqx>(oRW!2K4$k zzi5X|yHoiC>EktJ)F5!=LrFF*h_;W1?tt%GBu#T+jjy%?3&h-0DJ%}GMH_IB(_8{X zDp?$Yj97c6$cPg$#R*U1D+iY9S@NTbcp(^{<1{=Lueppy5r>MUolXr#tsQNl6SOtr z97~{+6SQcBW=eu)SGm>%E!ShgY@%GSxXBjE+q2bWNX?}QOWpfbB72X;Q@snSL-!OB z^hne!6q=}ocvVFk9%P9?%y1s1YbO21LrGdRaJN%rvW6=|x&xUme8()Wqfc6E!fZh; z-eKds!Y}>W}t^TXo{D8#(G@o^f>z>Omj_@__yPtxqA?O zH%aq;L48ZAHpPQ(o;KE7soG5AakwzBUZ1SR8)bpthHv%nwd2- zYu4<&ZK$_=v%F2&v^G8_Z<8JW^O1ETsC-#qE9&qme{rzzf&8}G%Weou#eHtAI?-E4 z5kB%&Z6G$=_=(@oy+8m*IcxKAb# zZKjc?2a)LGjmaXBEF?16bT`~@(K;~IOl%H8+Bv8f5!30;EYl3rES%g0+j*7_xPEop zp0d<3PKT^*#xoQx%NRQ7n}qFlKHcRY?+M6{!&`I66W+PlX$&RERd-UmolkG6SrJK= z`#5BY)g7mpdl$RS>Mm#c(o%}boPeIv)^*(@4DkgqG;bJ^sFks}zF5RYGV)UI48Qr1~<2zXq-?giios9Xxp_70SNh)QB+dc|q^r*j4qHbP2?ssxB|$Z+=%7{_eYMdXHaMQc`}`m++VP>D6tP6SB&h zZd3HuY_;R)Lt1)ED+?^hwP4^(mu2f z_t^=XpxO=rveMqt{&zzx*WMSzxZIEU_H*P!G~-<8Zn~Qxq~cz0&uB9UgGN4vjYm-w z_fa326pP_iR!@8nf6E7VkU4Q=Qu%R?roji^TOoQ&Tb@PM#8nVV{KNcfmksfQ5Q@l+ zmNOGlb?6jBb(zsJC2;`u5ws;SS%)l1G$RAzbaSX`uf@sZ{b{loKml&f;W)W-fNDoW?fW87_DG}VoWpiml9qyV z^4<_}@+Ngc{?iCfNsq*FC5E3ol-`4hMMKg1B1Fby(B%4|4!JI4HO?qb5dGz(%q|F` zPVF$oOEb%znX!memwCTI@`*vga`nKj*m-h9oU9#qhBw4*ujPA#hTv%R#BAyJKIyZ3 zupNJ!**clABO1zrG;bN3MLwCAg{z=6Y4U0oahe|=EzKW<$tgp~!^Hqp*$|R4-ys|_ z^`90QHWZnI3{vKjq4N-@erP%V7H5+QR395DlZOR*uy@Ze#hzhVg~Q_!8`*VQM4)L!N~cNQP@l4P_{vs<>gUiQW3etGfmo?tBlnyyXF~CDMMAGhe*HCp@>&C zdZ3&=n)s<2{Q&+}9~&-n#sqVFh}=Gg^u^d?4QL)iUsqM-+_F+nWo>YiZ<$6B_n_(YMJ7U1x~sl_9;HsYH)jwVznz#;If{)QUM{ zkyo6pB5b8TNGhPQ8f=w1TeeRvvewxu#8&Jy1M>j3R&c9o8u3Z9Z4VJo1kH6qhaV!( zt$W-qL#7jyG5u~G=g@RRdjA;&WlXorsWT|rRINmd+eIJ~(`FiE#}Y(w$qqY<&{ek2 zq}`}mkDjv(o42`1>koU_n6iX;!K}Q99E6CLoRW+kDD|)dnu0kJw~IB z#|%}!^%!pgD#mM`0Zm}2cpfu`GEaKkSNc89+siG|4XJYX5pAyNp^yTxS3V^=|0&Ws6AA;-dcY zGDA*9rYt5klQonsHcb8OVs+$2%d?BEGHjVe4qHNFRSOd2#wDmHV|A~JrPQCdu%8^i z6m3Z{v3aQ>{H>+Lj+2RkB3i4sh&1bDz^|CMuGrYRvx@`dkz#%Cbp}Y;2aC~1ZvN~m zmn|#u(CD4Zha*j=MrDr`f1u2M^6UyaI?LA!2kh*D=lp=Di?Hpmh^J)kDzi*k>5mjC zlbOGAuKR$k)*@#=&k<>k`Upd{=`=6(nALJKw$$13N(5YU>Cl1$0+`4`A^lt_^s6Lsce zP?$!d@V3>SHp`V|sU6~RERG2$p`auW>6|u}FuckK`~k+Q@=Vls49`tME({8einLBj z)zlZqJCVprC2Vx5iXk0Z8tE$!SNJhi+P@@JKT)Mw89VyPi)#X%vck&9|w`q{f zxRlp1nfWJ+qAf^bjp`ghQtxb>I}pn!V=zq^%bJMeU&0{WE9u#c(A%5h6I%v;?0rzac0{VS92#S!wzwUUKzI z!R?jZD%U3`Oh#Ly@iH7gGtL-~WslOwq5ffvxTzaMqt)bi_d$=0ail53G}JWAG)mT= zy-RN1NQa^;ux)r5D<3Upja@f!;*P1}tWCx#oc@WgJiUpMT{@G?u+{Yyqg9Kod9TnM z8jCsOD|Z%{<*`=+^qwN@39dB8Yp^x5GT0*!KUax04CK*uOY0zKSLuAVd=cxTV>)FJX`o?`_-004@M^bnHZ^h^L6~C zoBo8Yl$Pbkb&#vKs`I1qbu2?(+DgKm+#4rjU!6+p(oOm3tJFz%WdGL)!h4$>_ZnZ3 z@D@+klf$oNA~N2`Ft2-^&S<(9m%NUw;OG)~(zg?;++F+p}@hWfM35LR_}p(Va0Hi+C@Nka)*;lz7m| ze=`F|UFs^^<0Yr=q`hzER-*2n7kBQ)VY*u$t1dx^Y7FW7eP!8Ol+2*^66E!_$ht^- zDQ~MRD_R!4O@h*K^V8duEO2pQ{H|n00c;LTL=Wsr*9k`bH3e~a&&&QwI;B-Yc4H@! zwaaC@NmtZ&d^b^`zSws>)%55)So(HTQ`sKcsb)k&#?oZs-;i0T{~ot=$=^y5k%Uay zON-LxR_;Zm$0AQ3YU<-1;dUU_TdY>^JE&0Kyk7O9%unwVJ9$|{pAwfyM7cU5X>lzlkp$<%QYuRB=YL(Coq06H09&52$4m7 z^YH?NP!muTgIRQG%``$OwL@hqyqE3$$R=Z6!pLwEX@J;`ySC#bVK^$#15eRbW)$K@ zrnJT)x18$Y!T!gm=(eU}M#S+TdE;NK7SAFmJHw{afrw2dhi^`kWz*@9{t4X#)EQzx zwa&hnGe%#L6RL4Swoi@GLML><3HhC+Xh)O_oY1bbksdO9eb#l`tN*Mg&S_~2)|^BB zAp=W~^6a?*P62#n?&lk*`8u{(MH+c@0Ly^MUf9D*q3Mtz4`b*9*|=(}|| z1FLtCyAcnBvMc`Bth(}p$5JnT?=l2B=l5OJbvlw;Q=#St9Z#g$ z3IC>D;`CuRf!t}mNoG$+VZlwK@9M)|a{tXxwOns`EzK+~zl_%>l>9=TQ2h&Y*YFrE z_#wsThI!acCbHr`D|9IF)+&8c%x}K(<}HeY#o2Z_=vR)2ztX`^?MvJyW@B$p!M^g_ zNR~G-<~QOAw-a(xgs)ul8%?bKZ3h3^*A5jZK3Zenwfn>t1;KhDHY2E1W`k9l&;_x> zDNUfo7@L_1yY3J(5fvAPVP-K7K~xhQH;Vx}xbY!jfdQ=qCPXl&l|Xan!w7D*5**E1 zW2tVOmq3Gs41#yL!Tzm{eyZS9Eyv*#t;JM?vFsp;!yRd$wGrfBbcEF0Fhlyg!V2Tt zh!NOV{TnjeMhS@KTv+G@>E5CX&d>K2R6Qqm+P2mT<~uReVspblxOJyUX=;g7Qg+2v zG(~)#MrGtNu0nFN`7a#w5mg?<9`+RpZ4>yOYQvk3gYOpA6CZ+rwt~(EmC{mi+=`sO z+g8xyw3g0zaQKO|4pf@J5(fUNo4dNho!skyqA!G32fCuFVX77AS3H{8uOr6wlXNHRv&y?op~J(#*=8sDz=WCopGCr$f5GFf-?gP1nW*%+ZPNm}KAGiKd`IERw2qtHln}!H_QJwiQ^QSXvusL{q-oFj zlLCY#NEL$=f(Hesj2C=3r0 zB)cM!&^#9d0-YojhC7Lf5Yev_t*J<;vW%N5`Qa5@aFI|L9wZDKBu{9v8;Zn|ASV|J zqbZ5b>PjESo8jRIiij;(-&0RdAVE5-DuW{7=?(ZCt}k1Jr!VkqRgqG&mA$(uf@~^0 zo{f@fm`Y_d!$S_GNkzufEfg6;+eF6GHISQuT%l{$HINH38-oi^=OAI=b_lA9_-ocX z!V_@5i-xC*FpbJi=mJVB&HKoePQtrIA0ZOqWD5@TO-04SPe`i~33`Q5X_Xvb*|bs; zxk7cQ7^pMi;U`GK5w5((AmHgKNT6T1lGxzI!&`_D)OL1yy{EG<6?ZeGJs`;%+leDw z6_^cnJY9we!G$oVc0GKCd5H>l^5W?-c>PU)m^Xx_GZ`frgo>4Fqf{ANFL*)WLE#JM z!i8UZL#1?<5R(dn-b%1Qj7>zgSBg}-MZ16qbkkN#vHiQ7?(Z#T?WCv}`leR1i-tjA zgs?QXGF@w6PlO2Ma-SlnWF`5CcLMvk}*i%=J2<6VH26^@J$e$b^WB_Nz76?Wy^i4vxqV&MhWZj{^b^YTsID9z#wY-f=b zhDGuSWuQ?DE$~&OpgSQodo8j;QFmu^$wDiH_24Gnis7vuOomp-?I|)boha`qo>G7M z!JuB0r9p8ov0VM>59z(dAY*ucZ(~M3NQn|zM*m&~pUf6RAS;@(D=3Z@_%0d|?*|9w z2{V-5FT7z~ACY489_ynJdx`!~lZ+|hFng1ZV@*4T#V|&Bw3YxHdurYgIY#)ynHWI{ zEIvP^8k(O{YNkVA<$*5!^tJ-MfN|YHlZ|2riOI~Jjuj2qjW;~-#b*Mb#S1PG#EZ}L z?yLmGSAw7fn(|s(B9qdeBlKwN3g2<)2Wl&0l2P6piDDLUktF`4PsMJ^R#C$&HL8|3 zKE1D)ZE$p{FH_I|wI57Q5tzCwMsKF5Zrr&k{ao0VRA+Z#s;fJ=zq7ljKX>Ef&QXv$ zfD?C?ykdYDhRc&xc&Bl8OiI9ag1n(5jbs{K!}6I z(`wZ;Sd+zUG56j>c%M*_*-$Zr`&p@Iuig;AcNnENG+Hkx8>;vvb41Ja2LEhV$LefB z*K6dOR>HzqKPVd}@HR*=-4ykWCiAJjZU@TIUYB`^5CaQtPq581A*=I z>V3SYtVOh6Gpw8}l4-GM-0+)|T?-rWilQTxN#XYWY@CMvaf3;LtXRBMDrFwccj*O{ zNimc4Ra@ZdpZ);%vvO+i7QAjMGr$b5no10_Fjod*9BP>AVyJQ&TI{+9U0ci@wrPzz zxI#o+^?HcCiVCV|Nlzdn?WT*x#3u!vW7ByZvNKeg71C!2Dnd{jW0M(go8j&Z0uFqZ|xx7Hkx_?RGzB$waw7hdIk^h7WLj?NdMQ1c`)&S;7Ad5jf%Xg(V_D}2OL1k2)i4&^+ouj@~V zVA8;P5eKOY#72ba^;L+mqs0CTMJ0BiB+q$N83r#Bu1YqR6kzgVIt*IQQm~4|FL1)` z#bP>A#Y<#wC|g1m7+1jCy-@^$WvSYPrJ@S)@Xb{EgXK#46H&~6@Oe75@|W=+%rB^g z1swW=_1dNQ2gSf+lHNL{5@=m!e`t7GImk*ehp<-)dc~!<$N`bhFc$=_bb%M2amI;3 ztLU&I?aG+ntWdd%bAsSJkoI*flc=zRxD z^|hlR^94HpIQKjD0tY(1)C)0Xe8!M$6jyhYajJuQwnO0x3?1fjQHts+FBk7Ct=VB& z1xKNS6;$L>_A*Y2b^6l5YuL$A@$|Z{8A{f0MoK$ynL*A3AZ2Ycg|NkIMWgaBY+5Hm zkglHln&HYi&o^SplxUCf0VQk%%00-Q6CiXw$18-Zu`A<6@eFZTlmxe5;DBvI%ay{-~-$9bE?Ru{n% z=g2gKGJed5vITf31;32$daaV&j_ZT-SB64vmDum$VL_Wk2I9CL(B{NhAofqc?`0Gm z_)3-Y4#ut8Ke6^O9OJ8zUJ$i~^EE0j!-6d=309S%L4o+*HO&7r8y^Y;fmN}y`8GgFrgHqUd`*A z$l=pgDA>k+&VlmyHZH{)*SRjJdwjY(!$T?WztQ-D1ZTG^*KF}^X?*l$yNZv#N~5h% z`WKFp_)raQ{DpnR@PY|DIFY0`W#P&Wc1BX=te?>XCcnutlZO<3=LLJ;(le?#7S&aYcTp7la}Qj9i>;2~?Qgr_X}ee>q(^6g+3T;&C~0l> zUnwV~XLYaOA9^VaPV9Cvi0ZXK`a3KOu~PYti1kp~=kGA9h9w0-!yXmDT2dO-DCt#j z*!VY!Kv4X#NLsg7c}KLC1QYghIzg|Q!}-0uxEuR?54eEuQg^{i)uDGep47c7=vgfp z*1Ub93~4%6qMIfEow8b1VxH)?Dht~g9hK^Fc>tL3zzTQI!KIDsTf8aBGYDY7lT~92HX2YfsRLq49N(D4fqWM zlTkH`{okVpUVER#=WQEsm`#Jv*PRiV-k&?np_L*fZ1_M-@R0M@4=4mc@numgC%@bS ziI)!!f?G#K0Id_(8DfI8KL*OKpvfTWKvoMf#l+P8m7Y6y&BDi&w zPZH`L`%ks+{}l8_4L&_`fb|&P#u(n=2Iqcg^#9pFU3Xl}Lk5ep9gy-7E1keCF3|Uc zvv)p&P6Cj1zI+85h~i zPn~2-K6PPV`IOJ1{IdcdsVbR*KQl0;-&r$E`^?4i;m@23oPN$l`|3HG!Ecv9%I9uZ z9}DdKT!gms_-+6ee=CCE>gQ@RFVhK5kAL{n$l0c;`d13SV@7QA_>70lpA_)T7fh<% z1wl`I>HPs%cY*alo}K(9=c*Y$4wt#9!QfTPha5$Q!tczGQ%mNho;&wh=mk4!xst%I zMn*02hOu>gcfhyY;ar{YcoB!cRCRsJ3XTTR*{9JbTJYsp!htKa{aV=h3oy4wxL9X1 zKDO+FFHdHhM#KGIi*OXn_!6=`-27IA;$tCv9n}rn?K=#}{#qm$GobuGBCaF8BH9A( z1K)^f7w*@h_Z|2iD1O`49)|u$gxx`J2#as|bKH!J!j4Y|xY*MIu{qzmFYHbXdB!N^ zMk=mz^Bn1NKy|X#8IC7tHvL;)ZeP5po?7C!!+N*#vtY+9(a-f+FeT2;PlCfC>VJ7l z-M$NscHa^80dI?+)Zs_RA2x`NF#0n42}U{HK4sx>GfetUc$3xrUX_KM6 zpT_w^(G^ZbDA2C0!8m*AiZhdU#rFx{lPRNBJEJuPb4)U%?MJ*TA{`isKwT-Z_1mo!|-4k_1J zetKCEio&tx_}X=fWSnGOyH4&;k0R88Jo!hiN-*X9Kk|hRKU;yJKXK@$w5;+cPVWiS ze&$m#Z=nMUf9A7_)B50l<4yg-&wLAWbrjv8YB61~?0^^)GHKO)|K_t8k9x|U@!Lf> ze3P#d6b^>{(o7Cdrt@F>DIa-mehTk3h$LKyy%NgZO&$Hl&D7ET68?WoJ^2K}Xn-|Uy_@bYh>TT>}p{yu$eA1xil$M3P%u44$l zXkB}oA^a{DrV5P;UUiWXa71WmByQjQLX^gX_~9^YRG{%iZwue;b^_ZS8abH}195>n zn1<`CUq8DUyv!P9SNOp<%rY}CJPvhcjhqGl;H|WkmeSlZaIlrut^1_wPR_^E+lJpM=bIig z%|mFK{*N8l_@7{~nI40ue6;N5bO|SYw7VLS?>!V26vdE56!<|3anY=>IRDP(!$% zHWKxNf&M|L@zW;ZqUD3{f}D1m6+u1H_waBQx_9DR-oEfnJ1r0q>A_kre~q$pDoZ}$ zugxN@`)l;FlKLn&3|6*h_rSX@C2tfB69cqf2s-Of6#*LiG`$+NGusRe0a~FViSHtt z>2qG#+(GN(k(7Vdp&2RoHCAHokEEb_0SRz1NW)96A%H(*1+%FcFVR6wFmn^Jc_1w7 zs0Hhctv?a~=Q?Vb1@cU+x%$I_Ogv9gLo~X3kUo}$XekWxyR9(OjJIz8PUJgK+zAbN zY$uKHbe%LTwNO_Qc!lx`7}Bu@(#inrOJOPCge zWH9Sqs|I!D`9jxlUI(w#YG1Gf{E`*E3TG;GdJM9${~B*r?X*#7AxaBjW(4gXXP41P>_IZ~rKAf_7h)Xoe8y0d#17xjah?yNH!;vAz_4~`=GbHps1MOb}$ z(%yja%n^&vEP=HbcUSe+`ofZ46oJ8jeZi}@Q)AP68+ce8Cr#O5P?UzrIX!l;!?q}G zHBF_jS8drAm>I3n^$%BjQ2j}Qs6JYbhh~=dAR zoWdTJQqIL-&QcM>2B^0wvvMn~RIq_OJ-;Ma+%ppYl-vMa}TBoM5 z1`fvS$AlYcs7C?`G|4Sd!ItYnG08O7GzlO3;~VVQ?>@C(f)?(v$b$)5hQ}sUHoW|DRvQ+A1}a1a$27;G^J{2$IFF~k4> diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index 5bcb78e4..0a43d17a 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -209,26 +209,16 @@ #define GUI_BOT_TITLEL5 1112 #define GUI_BOT_TITLEL6 1113 #define GUI_BOT_COUNTERS 1114 -#define IDC_CHECK1 1117 -#define BTN_DISABLE_LRUD 1117 -#define IDC_BUTTON2 1119 -#define IDC_SET1 1119 -#define IDC_BUTTON3 1120 -#define IDC_SET2 1120 -#define IDC_BUTTON4 1121 -#define IDC_SET3 1121 -#define IDC_BUTTON5 1122 -#define IDC_IMPORT1 1122 -#define IDC_BUTTON6 1123 -#define IDC_IMPORT2 1123 -#define IDC_BUTTON7 1124 -#define IDC_IMPORT3 1124 -#define IDC_BUTTON8 1125 -#define IDC_EXPORT1 1125 -#define IDC_BUTTON9 1126 -#define IDC_EXPORT2 1126 -#define IDC_BUTTON10 1127 -#define IDC_EXPORT3 1127 +#define BTN_ALLOW_LRUD 1117 +#define BTN_PRESET_SET1 1119 +#define BTN_PRESET_SET2 1120 +#define BTN_PRESET_SET3 1121 +#define BTN_PRESET_IMPORT1 1122 +#define BTN_PRESET_IMPORT2 1123 +#define BTN_PRESET_IMPORT3 1124 +#define BTN_PRESET_EXPORT1 1125 +#define BTN_PRESET_EXPORT2 1126 +#define BTN_PRESET_EXPORT3 1127 #define MENU_NETWORK 40040 #define MENU_PALETTE 40041 #define MENU_SOUND 40042