From 2066dc453e708680533dfc80e1357c4cf002c589 Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sat, 11 Feb 2023 21:33:57 -0800 Subject: [PATCH] Googlyeyes: Different icon for small variation h/t Pere --- magic/icons/googlyeyes-sm.png | Bin 0 -> 6094 bytes magic/src/googlyeyes.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 magic/icons/googlyeyes-sm.png diff --git a/magic/icons/googlyeyes-sm.png b/magic/icons/googlyeyes-sm.png new file mode 100644 index 0000000000000000000000000000000000000000..95131a9f38c9cee89498142bac345b0287e7e15c GIT binary patch literal 6094 zcmeHKc{r478z1|=wxFmnL}bijEHm~o_AD_Wb>cPi4imF9GZ>>ZilXJH#Me%ilBLv< zEG2D+QxTygL=C8?A0y)&v)*ZHpNySlFL`>%JdnR(y)`Q5+gzJJgCEN{BMue*xk z5=9scrsC;A3V{AsLf>Wbve56wo((-Pn5=?;9Ks6#;^Ax#i$;$D;k*Pk2nYFe8Vtto z8Vg>3(9l?Uc4(o4q^A7!%_-6vb;%hM1vNF1iE-9;(H|N#&K;$%JV`tv*#B_(wTU-N zm(j}3?tW_(dY3;^v_mE9%30q$f^UCXb8o~HvF z(@qZLDA})~7X9JA>v506(q=W{9b*^pSxltn{wozv3z;6Nd!W z(;0K2hmPSM?0$M@-6fTF+o9r?NL}a4Q&o!(?jnY%+@Bco-?{pVV%FZL0q^ud{9Iw@ z+9d*$6UjxLI=t9+?^inhL}?Gg_&&31hu)Vl9e8gthgLP*>7*`iAGI#JddKfdLWjev z-=}OD8;hpn)J!JIU%WNl*6I6t!|>xZ8$V24wvE3QJ=?o+rnRpjvo1ApV)z3A=L=kN z)*5qYpGpf>8FTHD1QM(z3Kx zdC~mpKjGqpxK0VjEWyUEQt;49y^6^_E|(^~7uQtkJ&N~O!YgoUI0~c_Dnq*PW%v5yg@OkE+=P4w8VDK+3EpdcBH@zlj_j8);w29 zR`JfRj?CY$!pJFQGB@gPm_B!NEpkSr<{NHD*ut=B&4sU}B@J&#=vQYyfT@;BB~pHU zV0kEYdDCQZ;b}zSA{ncE?fT-i^~=ljbg?D@t_A5{|I&ZxWt;uzXyw33pFKf~7{y(g zs+Tqj#vZJH)caxBiodXmrBmM4+MrGAY%jkER06`sgX?G~uus|_4|%ldzIiqBtf`|` z?Q-8r38{?5OYGe`^JGlRYN(eAOU_@2*|Dki&l>P@8GXjS@~VF=@NxX3O#86gK2$-o z)7DcvgF1#ZdEM!{_k`NPl6{KpLhZDz=({I2J>SuNUHO%KkiN41bKwG>y43bqjk~9{ z;;cCep|ink?=DpLyBx&7RC!^f@x<<=l+e!SX?IgwFgNqtH-v8;4(q9UqHx|3*%qeq zZqxfY;#_~K+bDd@Jwto8H*9s*Wu2EfiU#jygstb+Bq(i(9Z$P2;chp*6*U`Wq!nVj z!K<_5SHr0_2ZIZjWG`&vgatEALSD3f7=2whBgA>TKGTB!s zW~au$<#NI*&3iozqI)cTGkw`ZHxr3b%gyJH3D$-gYiX}S8A<>PYGuwg(zMbgf|>Tk z41Gh5m?!&X;58WXsg_4kY0OPOVDhH$>S`)no}4SG;#wa-f|H1R zK7X@wg@#UhM8fil`s5Q<+G{#uW(os{LGph|yeDm0a67hXX~1A=iTc60i>Gx5x1Rja z%4w`sAI}p!kd~YZxY@n}#o>I3eh#Y<$2pR_Oj+ZRJ}FdA z<5bEOQ@2%buZ7z_G+M}LSJf`q);Xek+EQ)B-mwx%vyh##;}rqnIO!~(wY}1wOE@o* zwRgRr=^$LtZ)U*x?gzh7=>j4Nv(A6>Kk}K-C&xy zSPFbY^RQ)KDBkXv^u7&s=w*r2T-fl_&?5NsO+AN?3JnFT{T5j@pMb$6Qs^!&{+=!_ zUp573D>%OOfW5~}C*9j&fqM{(%Gm-o~w3r&p7&(5r0WnryxX&*uSi&7H z;T2AgM;#`{H%*K^wP^a31ap1L$vTZBc0!vspAK!(AwH`K6c)oApt2%Bb3TI&ZQ?MP zog<$OP@+K|JOYfQGwl%*wbu}EI@KN#Z0UpcVY`4)bPoXs3>5g1DS~JUo{DgEP_*L{ zAOZ%+1K@l{43kUX+atuh1n6F5Mj_y02rt?m5#r+ycVTfrIL;hrjz+rj>2X+ugCg9H zL!}V{NN%4gpeK7o6pzOypiuGg@#gUs<}6Mm3WLYvQD`g*i$y{RBsYP{1NcZL*FZ!u z&p`sY6b_xuqqCTB5hoDAisjiO5Kue(OMDErkIz?nCik-nkRB*Lz(!%r(I^H3^{oe& z=Nbo*d=BV8dT`0mSqBvWa#^t)3g{XKGI<8yQcx*h{n@dc7;!pO3JQz?84#2U^@{nf zOLtEn|F0e*2_oqXw%7|2`#U6$PWxM|?_v|Rh|~Et5Xk*2?|0}gxr@ON%EyO5Vo_p6 z;dzqm5u*MHR2GF!C5Ue^6o7)og4ReX8c##wY@jP|)8{c`~^? zfJp&GR1mp29pb@bEGQs|vqoB2Q!S7<9M%FELB&TPt!P*anx!S$Is!xahQg0ShpG~Y z`8FyM6&0eQ0aywMV6eyt8UV!rVr-B$mRKqhzyg+7EETk%L;zwcDuv+2;xGVcIOz-^ z5=60?k>UoC-~?xXPkRK`d_Hio#Xkn%(I5wV#A-S-mj5@DOlN?BJV2x-#>(0XV~xjS zah7N+oR#I@pdgULg(^|Ri9wrNV8tz>VIe@tK*9o|I)wlxL$JUS&^RR8hJgMC&!W<43I7c(nmlm3 z`62h9bD{nd#HRTf6$oygf0}=cp^K*y94?*|1b{N10vCt_sp2>xuK6ZP6u^uGq1EGa zxqh+J|3fKYBP=mE07FA!s5X{RHBqdPco4)REo~@xODu(Ag|?oT^(#A;ew|*~t&-`%|u;a{Z73KLq|+T|edeAq9R2{Ik0L zXL2e2{W=9Qp;J&i^s@A_Tu=hNXvs!+yOUsZqEGJCGntS@f$g!53xk;(h`tj1LdQ7B zD97{kag`gARF;8DQ%?D5LM9!aYY5MU#Sop!VdBFgNQKAKc~NlDVKF#aRSO1_RPiJ^ zlS6KfW%+oM*Jw9vo15yk^DQi59Iriy3)v z;+U%pyKo*xE98{MS=_$kL%N^tk0$RHUE7v?*pq0~QZ8fEa4}oC%53Jh zT*7PBXRFG6sdHol?Uep*m}a_tOWsX`T$3{@e@gU(ebk4!ZCljmvS1|!b-)(T+M>gk z>6Xowd72#Wl;}iKs#4u>;INdD*H9AdRbw(vGo}F%cQvP3CR~v(CFrMzWVrTg4)}I1s*|>Jx2xaU)N>7H-=H*MJ=E-J z-TwaKFc4>DHWErX%5CGmoYhv#S(j~j(cj>}VUye2%<})NmvaejI(%p(bHA@j{=hNt z)Z8Cs4S5MK*;F6zQka~Sq;36Gx0`Mw`47vNlmYvuG2u7ru~-Ge>0NJyYmKU;VzPP! zuq``zallI^|Mi>G`}|T4^v@dlnh&o)n;sN6YmDezc$BYQZb~HnI<-t&u2&MJU)S5U zVP6vqdFgWP?YaruGp_Q|CET4lM#;+ZAOG?R^tWkV@AA=G=4`IUDUZM!Oz6giw_m!R f%gf7q<~V5F!8+ @@ -21,6 +21,10 @@ char * size_names[NUM_SIZES] = { gettext_noop("large googly eye"), gettext_noop("small googly eye") }; +char * img_filenames[NUM_SIZES] = { + "googlyeyes.png", + "googlyeyes-sm.png" +}; Mix_Chunk *snd_effect = NULL; SDL_Surface * googlyeyes_img_bkgd[NUM_SIZES]; @@ -145,12 +149,12 @@ int googlyeyes_get_tool_count(magic_api * api ATTRIBUTE_UNUSED) } -SDL_Surface *googlyeyes_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED) +SDL_Surface *googlyeyes_get_icon(magic_api * api, int which) { char fname[1024]; - snprintf(fname, sizeof(fname), "%simages/magic/googlyeyes.png", - api->data_directory); + snprintf(fname, sizeof(fname), "%simages/magic/%s", + api->data_directory, img_filenames[which]); return (IMG_Load(fname)); }