From afcb5385c75c5f5a15b050c21315d9708c250b53 Mon Sep 17 00:00:00 2001 From: Dave White Date: Fri, 2 Apr 2004 16:14:14 +0000 Subject: [PATCH] added new cursors submitted by woodwizzle added icons to campaigns --- data/game.cfg | 2 ++ images/cursors/attack.png | Bin 1043 -> 1052 bytes images/cursors/move.png | Bin 583 -> 1472 bytes images/cursors/normal.png | Bin 549 -> 883 bytes images/cursors/wait.png | Bin 2626 -> 1426 bytes src/game.cpp | 12 +++++++++++- src/playturn.cpp | 2 ++ 7 files changed, 15 insertions(+), 1 deletion(-) diff --git a/data/game.cfg b/data/game.cfg index f37642600f8..63c998c8c4e 100644 --- a/data/game.cfg +++ b/data/game.cfg @@ -61,6 +61,7 @@ [campaign] id=heir_throne + icon=konrad-commander.png name=Heir to the Throne first_scenario=The_Elves_Besieged difficulties=EASY,NORMAL,HARD @@ -69,6 +70,7 @@ [campaign] id=dark_hordes + icon=undead-adept.png name=The Dark Hordes first_scenario=Brother_Against_Brother difficulties=EASY,NORMAL,HARD diff --git a/images/cursors/attack.png b/images/cursors/attack.png index 2406ec9e585161d3898069de1202c013bf229399..bb8f00352883df25279b1462954657ec1e2a2e87 100644 GIT binary patch delta 997 zcmV=wQo|T@Zq9 zV~dy&foU{oX;~<`b$qrHJ31t#1O-M{C=~kk?eT(l85k56ILUMKJWu|=Jm>t+c@zX8et!N+dwcui+lEwCRXr07 z21mSuPH8@!FM6n4WMLH&iA1h$8=@$Gl-TX|5BvN3XNLz}(tI*s^gqi*zkO-PAjQDD zxw*L=Znt}Bc)%s+zqE@!S}ywB4nWlGlmg%&a9mZ@-kzSG<>3LBod4V|iQg+$A=kG7 z*=04Q1CIc&11D8g{cRm&s6zC=??T*ecZH^D$3&!7MDn-7umBmrKHyE@)LO`Yxz7qD z(N`h*^d%YfIYmTd)a#T{uTx^N*r$N?|9Zv*=)fW{2@C*_89+9W@?Q`WApe341HZ0=yxhb$KLydpPH-Tz5r^j% zdmlSMLqkIpC^Ry#rP`Q{%f-Nd8^Eceq9Tuo$i>E5IsUdqJ^~p88F6%p&*z)0tgJi& z6alG#vXS805Fi1p084;YS6BC(Sr0!r>^#jwPrbv0$B#c6rRdyQtgpV7{>od23Uy8Q zc&>RS0L{?Y{3TY4k_kN8+1dG>x6diwzSRQvcXi1Tn{C}oW@csvni{`+9<$N=r*4PNy@u5hNTAds5g5Vi$yzh;Q}i*8xHGgWEsb*VfjyKQ$gt0Z62!MGn7r_*>64PrK1i(?Hz3S)N2l z7>>H7C`_smvJK)OdkFC=$zN*oil|00v3RTvXx)Yu(JiQSlP8( zBYr<9`$5WpCxHhHYx{s-fF2+S#I{oLq_Gl!q7jenVz(A&SvU4jmI1rrf4?yeqQ;rr z%jgwjCF3kFq_9Uc;>jfX0&qh?F$ppW+yo*90A(A$t=VwPeL%XQ6*a_TcL4tYnS35^ TN-^cp00000NkvXXu0mjfE!NG{ delta 988 zcmV<210(#L2$Kkq7YZ2&1^@s6D=Y3@ks&gF0S^NT$m7V|000A^NkloNNC{2bL!r>6hkEl*5WNa}^q?L@ z1gWeGW$O=0cav;mS{7^Rk8Hj>W;!W}X@=QkXW}IV@!;-e`EuOah#@fI?eL( za<}Wc?@5w$T?kQV6gUBNAOcvqT+Yxmt(y%Y7a@e%2mny3BfY?ZVHg=zRYw&?VRLhn`T6wT`JrNtMI$C;X%>Z;XhAK142wGg5- zIXO8vGBWaOXJ_Y?U@-XA=@yV4(qRSo6F6V1)jXzY9(ujrkfv!Z$z+mPEarDz_mXYf z-m$T0-rnBF zKcd%0Yursp;$99Qx}pb5_R!`MFD zE8gl?LZPna=H?Utx)lK7&&Zk-h4@CLe7SVL zEX!-v@Wacr?DTDcK;YeN+qRVfkO4^lRz5~VM3W3425^9*iYPFEym~I5p4vMutvZ=j zGwh`+<3J#w{c{E;155@o7+5jNgz-(x<601NBXDFMz zU=(8?6$JmAg`ysbUmNc3m;7I(3x+)0(a~{uVq!uCP*@6NULuQuOn@2lGLeD#eLf1h zyoI?-?{+M!dQGv$UyvQnD*wv5{STzap7wJ~UDwmo(@|Sn>jmIkN-hBa$gq20{uP7O zfHi&(vHlZqJ?Q-msv$I<29(W! z$snx#4DfD7QqADX&j%=eX&>pSQNhY3By+e+R+O6Z>N{U=)`s_#i%f4ibm-8or9kEx zuo{TX7YN>mAlAGOG8oL@9`NEUWRutT7%2P!XJ*!lj{c~|Cw|Gz&4dioTJA6^-f`+HUUg;W zMqG@sKzn<86#zE?r3DDNcjt@6WARg`PFVmv_GCc>umZq60Jch! z)G#?Yxz#Omr>d&d+c!Y*c${tDQZER>r%chi(WLdC7SHz`k7R;xmt?|Tb?3Lp{=hX+HU&}1YM z0q5MCNF>DVk3Uf&RkRuj;lA1afh*C`(ed>1inW3>(`U$9P%o|D!6&A!jgO6urELZ| z0NP>(NdVbJfOEEvF3x$ptE=m>&*w{uqL>*N7$`P2Hm-c}`Df}&lm?5Ct*RFi$Fa# zh_XmtZWrOO<1By_fUI=0H^Bl`dvDsYZi6kzDFG<4Z506W3m$Q+&lBNqEJZuH!v-~M aX67FmG`I<%*v3Kt00000n|xE zK~#9!rIbBS+fWpSAKy4>LJ;Cxl~AKdCCHOO5i>)luH^@G=)hPpG2+mHUw}Gy=+v!S z*NzpDg(87Kq5~2tQBffxu?Y$B?ckfnGWa&Yk?!JaJ$}!7&TBx*QmG_)LKz?xz}QmH zDi4JSfP-@Y={yN?)`IG<$Abhwy#>u1_kO27YL8}vxFZ$72Fg<3k_{sA3%Iw6?`3qviS6j~F>jElBEGRnt*pEN)}-bg451TYSq&_} zoHG&u%2>5DT4U9|xD32efB_^4WW(~>GSzA|Zhj>;;@BG3?v<=f@!e)4!HP=O)n9_P VwPy4NPVWE!002ovPDHLkV1lLl{4oFk diff --git a/images/cursors/normal.png b/images/cursors/normal.png index 184e08c40620457d6e36939437021db3e88d0552..4dfd6c8560f9440632667d9acc96cb16e5fd4d73 100644 GIT binary patch literal 883 zcmV-(1C0EMP)EAm)`4v#g}F95>rruft?A zxo9CBM}mlmn3qb-UykS{NA#j2;U6thfq0(x)lnc0040Tl<(U#V;VKQU`)e*F&bCiY zP2KT4?=o;2IQF3s2iUt@N|jmRge%l9e_7MnapwHww3Xe}>i{RhVCPJkLAV)6;VuxMU&q zdj(d{07S)cF3iBOYfw@+iJ#ENuW^4aC*OSgLohNjlAD{GYXv^Hp*I1wRbRb`NSJIB z6Kok{jF{|031;e~_^4g}* zi=rF8KyoXPd(PDStmsxv}Yr>dQ}auz8ls)7#JA1)!W-UGym(0qB(aPG|01? zbYJ{TB@zh(Yy%l!5l91D7A6M*^7;IYzP`S(R4Vn(_x+vm@$vN>tvWn@RkT60)|Kk> zz&h{}cx5dM0CNzaCK`?YZUfr|{+^wk{q1q;MdV7)-Iz8eGC%)BFD)$v)(T_y<$(gA zt96mGHbre`bOBAS>*~S5!MN}HZOLRZ9t1(mTJji}22#MrzB~>DD4-5F33#^k0t@X1 zt^%z#;3vQ@z*At;T6f^6u^|Q4(|o0Sflu}o@z&b&r>(qDE!_PI-nXlA&;?EaXMvbq z-vrjIUBO`>s!9vj+W$_ST`SsiV35sW6_iy!}0=UdT`X07Vs{<84;y+~a?pob}aQJscPyzf*x=KDcv)0A% z@Tmo$l=@Z{O5VYbIHWx&orjU-K}JW;QkR(c`#RAH^+qlqaKA7*0760N zX@O4$T<72>2iJ@4zxOepCr0<}H8r?kXA|_cf^!G!Uy8=d5Bu3(K!>0Xvm@~D@RsgS zVV7YTc47jiMqGONQ=Gp zt;If1YJ{7iZ(ho_ymY<_HWC5@S}pez8$@QdM3{4mYEzXc(@bFkdY4vu-QQKSN}dBM nDk-JT$HvCX9dNbveK4K?U!AA}{~EGC00000NkvXXu0mjf9K`P_ diff --git a/images/cursors/wait.png b/images/cursors/wait.png index 104fddfc2c7eaa016ae7f72a37f14b2e3deb6fc1..b2ec4c7f88661352f43f78b0a60818f24c8667c6 100644 GIT binary patch literal 1426 zcmV;D1#S9?P)Dd>@c4C8xaR?$9NX#aqK;S}%;J~7Y3kC#2Agr z{Q^KKl?C?m|JIvAh}nx@3Z+z5h5o_H(zmyIjju2y2+^@afzo#MrrQPqL{dA5WygN_ z^pk^6KCpY@BoF{?z%zmULYlWW%P)|ReTf~>015~J1WG9g#RU)rgaQ>p%YpL3W#o38 zym5H=@@Ih8fI4svIBx>4hC%brc;EBmr>197{v5{Iu@xxo3|0Y^5?#@FL56{CuQPq( z*r})XKU)H}1B<}#Kp+5Ad#VR>*?%lCrsOdHN@I?D~u`qScIsTm= zoI7n1%2lsnC^fl)4jKX=|B3gZ556bD$+_Os(+i2R^hLP1lqtnR>B}`HgsXck%W4A+ zz||msEwkI}Dt`aYkB9xXyu~?R+vvN#8MS@o`erMd9SQrh>oV!VtL0MRvok6@1WJ%f zrRutb2D{**II5wHZ5Go(s0H z-nVgG*U}uYbO-%CK(&?P*mphb8hQKio>USu2M}Oq`th3;HuNU#wBy^C#2Y==i~8{F z;s&m6CaG4dX`o+&IRBWUnv(`cl1}Fdj3`DlPAaz!JECX?5sYYzs2R}H*N-#=EiXpB zmZMUs{QizLZzgiWTHL*b{ zR48e+Yb+gpf~~uM%kA5@@AAES_Z|m&fGkkI5JBnic>CPfNU3A%l1Hs-Yk(c!g8;1F z+n8HUR34gm-@?Me`g*;d@jTB`O3D9H`~wFL z%odBq6|Dm^T5yhZ%Dd2goCijLD}Y|W?(B;HSW35PNlWJR#Xm|Q2IO=e6S^xz$07dB gIhxURtqJG<1o}*0HYdOx=l}o!07*qoM6N<$f|d!R`v3p{ literal 2626 zcmV-I3cdA-P)*WC$M=qX?YX}9p8Ih= zcOR~unF*v#%R`U!*FMtLS?jmfK6|gdgi?zC&qu%GUF?rv@hC9PH!p;a)(Y6dZh) zriwI8QA)A9TjA=}>l6yRiR)UWM;|@^`L3?q#s4)xvl(>0_S*c-BuT8ZXHRV8a+x8e zpuAV**E8GH>LHCrOctg-x#Qb@A8(4z?!9ck1+Y z+t`Mnu-RbuR>1gFo+yPdg6QaHAB|xhcvb$S7GBtHvQ%do|uh+P; zo#V`L6W!M6AM(JEg!>WR8Ev$$SV6o$MhT1z>YO|`&My~ZN;?&%rbdXOl-b!exxT*M zI0#$QC;4KPOThV?NqFA++z{z2g?d%jU zU)dmzQzj;cxpAYy_3PJ-IF4@vl*_f;$jA{9h7ohC6$W}8QU$qgr|nqXb`;*}{4H4s z6Gady!brUdGBs+k;PUomo!!E>{P|t+S)RJESIZ~q^YvHy0R3v_IT;K&7oc$ z-O^D~5`>CokP^n~?#S=TgrXHGT45XD03wVPJ)M$zZiM-j9pX5}^Bgues}u?a0iYL) zI~QHo)&O4L*rO6=ND?r!7OhZ`Do9d@6VNqmG|=nymS&m;NS(lg(xe+cp42 z7$#^^@%rp8#T#{6VcSrxk+Qv)u(2JpR*d-em%qg7^b2$}i+ty+U!q!9_|1fhpK_~` zP}oga-HP#>DO=aJh^tK^&85)@ux*n#P9vb)Y&Pq9lB5VBI5-fK1PaR)^8FdSZkHrU zQ3?!QVCbN0f{oW_Ig~R9f`EVj#YOyPN|Gv~7@`=YfQ%{7fYz-#ma8LkI#Cp27&=Kp z4D1C#P?v^bP^~rrg=2xHN#66v$H@QPrFAq-qgHDmL@EFgMUgHo%b?L{pcFXz z!5S+}UEr8)Bd#sU*aFXPLp=2GqbQ{~ar%9Xo;=N^pZyaT{_GEl>pQr%#I*&EDR3-- zZMLO_HKdf(>;A#z$1qLPlpP%&zTX63pf^Le8)68BZMKcL*1l}n&VVh*W()v2ySjMt zyZ^wWpZW|-S1m6s1xH%hCiOZQDkUj0}n>il|n7h7Nae zPtHf8u#DRVoPCJQeg+&%0`29>cY1u|Z@$MDzIK7iZi%mc@*!qlzKCrKEK^_^Ap9-z z8A%i+l*>Mc4|j%u?>J5%bzQ?WO%@i`v2Bate1b`Wse@&37l5q`ED5&OE+o1Tm_p&% zCV&3rzu=qS`$tUM=38HQg6U^}h-I{+Z!Nw;cizMI>m*4OA3fT&C4?yT_V)gz1UPkS zG+A3K5{40HCyy|w7YO_a!w{H;c+-$6!IF@3Z65s4A2Bv@0!P={P`c!!kA0G-esqzs zsncXU2SbP2+BI@kdnc`|+@Pbwt!bK=%jfgEmSx?(4?O+!^Q~+)Yd!G56iX{b{&O>> z@5C`WJq_2E*b>Zr83Oi`K)PRq?mU{ew{L-&rBuAd;&T@n8R}(kugcQWM)KhgPb`?G z{_ND$lz-1X_dF>N%HsRqe|Du<+)3Bg3XBZ*GwjuAZLXth0)5}1F51p53AO}hKO=?& zUAE_S0r{RhQQc?pxqs!@ksgAe#q#nd$B*{}rl~JGj#EE+^yrgsRzrZkzOIwQ!#$15 zm**&z%A7heOb<1-=VlQ~A-N5q3%K&i7C-p@Lfg3jjrIW~1gy=>GyS7~;nPGNbaUp+1WA%oEbg*-a~B~6rfHJRI+%t@X{XHIo=>$>CF?n4GcIu) zv%Otrd3i&1bU2N3=SF6P;N@H{S3Q6J{I~AB6aLP=pjxeZFTQx`<{NKRU8R(mm^jAJ zP#$Utm6tTFt_}z_-jVMWy zgAbDZpV+wLKTLo`*L8n*c(^e>KK@slru}~1@mrsAxja%Tl|CB;0YMNDMG=-|VcRyg kZPVA+_oU}}@6??AUpAZ;t~lKy0{{R307*qoM6N<$f}@HPX#fBK diff --git a/src/game.cpp b/src/game.cpp index 4648e0a436c..d3e1e8beba4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -665,7 +665,17 @@ int play_game(int argc, char** argv) std::vector campaign_names; for(config::const_child_iterator i = campaigns.first; i != campaigns.second; ++i) { - campaign_names.push_back(translate_string_default((**i)["id"],(**i)["name"])); + std::stringstream str; + const std::string& icon = (**i)["icon"]; + if(icon == "") { + str << " ,"; + } else { + str << "&" << icon << ","; + } + + str << translate_string_default((**i)["id"],(**i)["name"]); + + campaign_names.push_back(str.str()); } if(campaign_names.empty()) { diff --git a/src/playturn.cpp b/src/playturn.cpp index db096fab226..d2a10ac621f 100644 --- a/src/playturn.cpp +++ b/src/playturn.cpp @@ -394,6 +394,8 @@ void turn_info::mouse_press(const SDL_MouseButtonEvent& event) current_paths_ = paths(); current_route_.steps.clear(); gui_.set_route(NULL); + + cursor::set(cursor::NORMAL); } else { const theme::menu* const m = gui_.get_theme().context_menu(); if(m != NULL) {