From 122ed3c3bfc30549468687b0a83bc15fbbfeabda Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 13 Aug 2015 09:18:25 -0700 Subject: [PATCH] fixed issue with mouse in antique shop. --- desktop/src-common/advent/utils.clj | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index edad6557..bd040859 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -240,15 +240,21 @@ (defn update-override [screen entities] (let [last-pos (unproject screen (get-in entities [:cursor :last-pos]))] (if (get-in entities [:state :active?]) - (if-let [mouse-override (find-override entities last-pos)] - (-> entities - (assoc-in [:cursor :override] (or (:cursor mouse-override) (when (#{:main :active-main} (get-in entities [:cursor :last])) :active-main))) - (assoc-in [:cursor :was-active] (get-in entities [:cursor :active])) - (assoc-in [:cursor :active] true)) + (if (get-in entities [:state :hud-active?]) (-> entities (assoc-in [:cursor :override] nil) (assoc-in [:cursor :was-active] (get-in entities [:cursor :active])) - (assoc-in [:cursor :active] false))) + (assoc-in [:cursor :active] false)) + + (if-let [mouse-override (find-override entities last-pos)] + (-> entities + (assoc-in [:cursor :override] (or (:cursor mouse-override) (when (#{:main :active-main} (get-in entities [:cursor :last])) :active-main))) + (assoc-in [:cursor :was-active] (get-in entities [:cursor :active])) + (assoc-in [:cursor :active] true)) + (-> entities + (assoc-in [:cursor :override] nil) + (assoc-in [:cursor :was-active] (get-in entities [:cursor :active])) + (assoc-in [:cursor :active] false)))) entities))) (def default-night-merge {:r 0.08 :g 0.1 :b 0.36 :multiply-amount 1.0 :hue-amount 1.0})