From 105b6958c5e7f754dfb4861d744b8c570203701b Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sat, 24 Dec 2022 12:19:55 -0800 Subject: [PATCH] Keep Googly Eyes x & y >= 0 --- magic/icons/googlyeyes.png | Bin 0 -> 1654 bytes magic/src/googlyeyes.c | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 magic/icons/googlyeyes.png diff --git a/magic/icons/googlyeyes.png b/magic/icons/googlyeyes.png new file mode 100644 index 0000000000000000000000000000000000000000..d4525412bcc8128bd10c447beb5dc2d6695650f7 GIT binary patch literal 1654 zcmV-+28sEJP)X0004lX+uL$Nkc;* zaB^>EX>4Tx04R}tkv&MmKpe$i(@I4u4rUN>$WWau6cusQDionYs1;guFuC*#nzSS- zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbCFbSo4Gbi+2& z$%K^6txDlnL@)#qA;cAC)#hY51>f;?j{slqVm!)W(glehxvqNr#<}RSz%xZNlb$CQiKSu}t6j`WrcOLX9MyD#@`bF& z8s{y}dZo_V_v9~(J}{ee5``6Cn5uTp1mIwF%68lHTZO z(Ia4B8@RacXzCttxdRM6)f7{4r65hAPypV~=$mrD;4RR%=JnRz$LRx*p{`Olz`-Ff zR;288pLh3m_xA6Zc7H#8F>Xv$72?080RR918FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b1W!psK~z}7?bl6@99Iy(P0$#x{qAX#kjds^5vvM zoWoY&+cVA`MX)_)FS3)_*~xa|ubrK2W5X~yiA)b)I8M-06~X4_yfv4)s`ULi4js4e z#%vVZ+X@u%d64HeQc(FEb}{`Q9c*1Y-^4$BARC*T>QfeB8mSd_cLjv?bv^4sSxPf3 z#gmLr67n_{QzB_wZIVb@ZJTtXNsR>@#uN%caqXG}e>#PO??eah!#|H=1VJh0yra+Ecg2O)Rb>>E@QY+U(91MH*dbdZT4A0`TA42e#ZmYwRrKBt$ zsMtfib>QIXsH@?~^2j#?d7kCDOrGC=H>9Fim~yDHpN4>&H~VoyADM9z9wNdIT#1as zozb0i&e$JPmXB_wJl8{3cKc-Vyq7C8Wu7U^5G#4QPoK#u**lQ7t@mR)6c#P^3}goP zvQz3{iPqTS9GPkwev`6^?Xv6~yl-V0%2FtmN9|XM#VoUdH>eIFZ5nR{zJ$fQ?)DuN znFATUD<{a$j1GlYjv7(CKWEBe)5**fU&cmEd9P1TUoRF!z!rv8<&T)mUi{M}wHku8 zrg4`llC_y&H%WXW^7A-;SPa@(qIbvpO1#@g}au zcI?0U!8GMt4gZYQHamU^-@yyro8*eN{YlQR%T5EUP8&b|Z;~Fqi39w--&aqk^z}_m zyOuo5sH$;H=b0F_Hy_qmepG~G;`kS7`e|)@xvphB8q%ccuGmV}+>;t=d`7UV_4XtB zstY~pi}6Ee3H_9NP1kI`p`$|MF&^VF9^*stA20MizM0_^4FCWD07*qoM6N<$f|#NV A%m4rY literal 0 HcmV?d00001 diff --git a/magic/src/googlyeyes.c b/magic/src/googlyeyes.c index 77c4781b6..e9d56cadc 100644 --- a/magic/src/googlyeyes.c +++ b/magic/src/googlyeyes.c @@ -154,8 +154,7 @@ SDL_Surface *googlyeyes_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED) { char fname[1024]; - // FIXME - snprintf(fname, sizeof(fname), "%simages/magic/googly-eyes-pupil.png", + snprintf(fname, sizeof(fname), "%simages/magic/googlyeyes.png", api->data_directory); return (IMG_Load(fname)); @@ -222,6 +221,12 @@ googlyeyes_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED, { eye_x = x; eye_y = y; + + if (eye_x < googlyeyes_img_bkgd[which]->w / 2) + eye_x = googlyeyes_img_bkgd[which]->w / 2; + if (eye_y < googlyeyes_img_bkgd[which]->h / 2) + eye_y = googlyeyes_img_bkgd[which]->h / 2; + googlyeyes_drag(api, which, canvas, snapshot, x, y, x, y, update_rect); }