From 722efb5a25209876d967b7361726158ebe068b08 Mon Sep 17 00:00:00 2001
From: = <bryce@brycecovertoperations.com>
Date: Mon, 15 Sep 2014 22:30:01 -0700
Subject: [PATCH] continued on making cursors work.

---
 desktop/resources/cursor.png                | Bin 2192 -> 2246 bytes
 desktop/src-common/advent/screens/scene.clj |   7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png
index a079a4ae5c763ae55305ca1b876396282443c12a..d87b759e821b1988721a068d78a0de993d359f84 100644
GIT binary patch
delta 1154
zcmV-|1bzFE5yla)R0MxrNkl<ZXa((8&r4KM6h0%-qD@7u{IL)s1UF&eMhYWsHf^GY
z*|ahY!(|};2_gh-BuNs2HiJnE+n7mGxDkprf<)k=8COQFS_Jue-_!5SnLGEs``&W`
zArFlAzI)HFd%o|U_Y^sn|GEMNefo}$j-XbnHLU6Vtn=Xa*PwrJ@<Pk}`QjsgpH7zZ
zwYna@+-&=Y$svvH2{ULKBhv=Y8f?s|!?`BH)0v0C{qaXFB?j`|+}vbX=h)lZn~CIk
z>H!;90$B;@^5a`a4$I5SQY;n|&)a4?nw_1Mqyw1x`Way3H#hf0WN$bA;hB5?3VfYM
zwOSS1k2+b-ha!Jw(Ps?UnLqBO84(lqc|_a#@^9(@2nZt|bF7I0^iW3cm1OSOLac)4
zh!EHteIViOkN3>UkF5{R+jF+(inD9r_5*ZErBdNk%H?u2$3FDJE)ef=;sSYldplP>
zU<c{$?iS7&%Qq50+Szh*brNmM*hzR=34jEXj9do*=mdX10{uX-VLc>(O91|_Z|kmY
zsjW-}9mA7W5@_(@fS_w4VBOTi8U@|YCV5F<^W|I907BQ6)7aRU)s1OOrKJ3=1b_k9
zla>T%>j<X7H#-1H06p_H0ANpb4an)*A31Y<0xFRVm-cV;_r*2&w0Bo_R;Rh;9Zlf9
z1|Ef^B6@#JQ*XNfOyj_3>&m~002><{(%;`7$MlgPe&@#)61RVL0Zj&~!Hyq>03SCW
z;0N#COX1p8>1%r-=WY+m%0j0Mmj-2`+$qzQYS;zD+672j`p3vFpx2V-AiYmq^#A}q
zTkLB+-Np$ZbkgJjJqmq>ukC2b*EOKe*i8hWQ;vUdN@cF;5g^_ex*QN}?6DJQJ#$X*
zu@3Ot4{kod=gr?*zZCB7MkMHKo08$Zsyw%MKhwPvd=SMYX}ZSz{Jgaus1XV~GBVO|
zfpjbYg9~Q!0egIR!9J^Kd`JeH53R?2Cjn3>ylZSmH0Jo`?Z-m#=6G=D)?f_2Ndo<B
z{tJJI4)F6!*a0pML@s&jW%03ewV#)sfzL8jnv6QY&MKoekGcy0%&Z+icRtg*3plNZ
zT7}?7oxtYH=Y#f1Btkq8C`k~9qUT)GW5Wj(8H@m6D_W7S1Hc*H=`UZcMShoG&qQNL
zh-kzgu3?VX0dzqcJZr&6Aie|81t9DMn1g>5_y%x&1R{5~K3far&F2S{No?26;f=K2
zTI6LD))9Lk0zpXYL)*K+HuGm5+BQw>1`t>TIH#kuNh1Ng3NW%0U=AVZST}F~zDE6T
z-hTt(0XdTdb&vI#3;eo9<19}N=z+EbAxj<MgZ6pt;DfO-cll`|fM!<KB=~htA|QG&
z1>n1GK6MT|B47B>Bp~Qm*Js1CPv|eJ9sR-{xukuS(vD-E__U!9J?1(G940x{0eo{1
z!$uCDU7CI5xU{qs|5}lEE6#mbABVN~)vlof_>_<OzAjcSwjcEa9_M#lfmT=GFATyS
UL2%(doB#j-07*qoM6N<$g3bIc-2eap

delta 1100
zcmV-S1hf0b5s(qER0Mw~Nkl<ZXa((8F=!M)6#W-0#70G{TvA*kfiw~!2tkRM^BNn`
z;~J}o5=be8H0eV?un7dkfM9dPU=f=m1cMTg6k-zyHYvPIrD!EKX1%xiHh<@4c6RrO
zB$yA&%>4Q9&)@(4{M!>bmj5~f1^xELVlim7S}~p8KkReF?~8vi%ljRMd~_2-8te%(
zVQD}n<}j=g_tw^yH<ZD_!AwP-Cm+DL0?Ar{E<Zj!VrVoPQmIrD-?ztfw6L%sNiSg9
za~=GAAMl|LBXoLw5OXu$X0s`_hi9Ai)Z0cRF^fHY0B1hjOEcn3;PZ&a`r_~C05}jJ
zU*(vA6;56*fb4&#&z54OWBp|QVQ~LmHG;r4S{RdW+wYtOb9Ug06NlRm(kb<Nol~jR
zYT+FFuxodLXpa*Y$vZncx$*%Vq*N*i=RC_dl0f2YvAH^l#`5eWKCK0S0Fywz7r;J<
z*Mc>Qz(@X%&l?&Ro3~bHgJOBwS_GPWfJnM71n5mW=qP{aem2Ql1U6qjohA^rwwNX+
zCai8uERB-lw-x{ZsGclEfLo3OdDA&E2oyl&<|LP~5yYPAACc3oUvlR9RJ2#F{<+a#
zm)GUP-d)*Un~U~*6O(wKy>CA$i9T%FeHVdg@II_7{*D6J+}xDm;o<1av_)VeT<c!G
zT91616Oez8n-B7XH*ckI?Wzp*ypVIZM`d-XPs-I%nX2{4T)io+Rk3yf7OnQpE}(Tu
za}>Q#T=@V2J}maNoo?eK5H@MzfE|TC+dtc(%GWhu&$BxUfKEBWDUGSKjrtn^#N%Px
z$IZWUYm`3$9dMA}`}gL9eBS)+jf-vDFJTc3^~`@td9NwY?cJ}#r;B_Pic8XTjm5=9
zYd(-8BzAm!Ja&QfSs(@%%;p1le0Kq#RWv^=2AdCU$9-o3AW`_Ov4IFSM-mM^+dXeS
zy8%8F&F=tofbXB$9pJ)9=#sZymLE%h?|B&*`6y%6>97Oru9>IquXPsynXV$(N5p5k
z^TmI6#7UgCL$2E7hMmCX%SAqY5T8^;utfnS3C^MDIdyuBeNeH2aR90nttf2=fYTde
zm%^9FZHIt-&ap-jnB+rG!9M_e2cQc;*a<L4QQ#ZE^%02J+4^iPlsBIrP-bDfZVqpx
z?baeLn=p^qLm`lav_3T6MYb6~<IvbNXLo-T035+N9i<JL0k8<T#@Kj0AN?zMF!?BU
zrnbX8@83XR5i^SbYg1h0n|561%>nSll7y^zBt9<=G4O26Q~AN6Fs5KVGcyyIdhWYM
zT?ClpLF>mq1^!!bVY|^IPCP3sE73z;)^|W0#O95OvE(^B@A-_`Hs*Q{I?4q$KnFxw
z0Ep8@yb(gCC46QASd6>%(JkH*QcRWDj$@WbV4;)c`i(pSuW=mWaR&Zf27Utwcj}dT
SK)$R10000<MNUMnLSTXr!3wVc

diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 25684154..a83c96fb 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -36,12 +36,15 @@
 
 
 
+(defn find-override [screen entities [x y]]
+  (first (filter #(mouse-in? % [x y])
+                 (get-in entities [:background :mouse-overrides]))))
 
 (defn left-click [screen entities]
   (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})
         interaction (first (filter #(mouse-in? % [x y])
                                    (get-in entities [:background :interactions])))
-        cursor-override (get-in entities [:cursor :override])
+        cursor-override (find-override screen entities [x y])
         ;; TODO - hacky way of resetting queue
         entities  (if-let [current-action (get-in entities [:actions :current])]
                     (assoc (actions/terminate current-action screen entities)
@@ -220,7 +223,7 @@
   :on-mouse-moved
   (fn [screen [entities]]
     (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})]
-      (if-let [mouse-override (first (filter #(mouse-in? % [x y]) (get-in entities [:background :mouse-overrides])))]
+      (if-let [mouse-override (find-override screen entities [x y])]
         (assoc-in entities [:cursor :override] (cursor-override mouse-override))
         (assoc-in entities [:cursor :override] nil))))