mouse cursor doesn't stay highlighted.
This commit is contained in:
@@ -246,6 +246,7 @@
|
||||
(defn update-override [screen entities]
|
||||
(let [last-pos (unproject screen (get-in entities [:cursor :last-pos]))
|
||||
mouse-override (find-override entities last-pos)]
|
||||
(println last-pos)
|
||||
(cond
|
||||
(not (get-in entities [:state :active?]))
|
||||
entities
|
||||
@@ -253,25 +254,21 @@
|
||||
(is-unstoppable-script-running screen entities)
|
||||
(-> entities
|
||||
(assoc-in [:cursor :override] :hourglass)
|
||||
(assoc-in [:cursor :was-active] (get-in entities [:cursor :active]))
|
||||
(assoc-in [:cursor :active] false))
|
||||
|
||||
(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))
|
||||
|
||||
mouse-override
|
||||
(-> 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))
|
||||
|
||||
:else
|
||||
(-> entities
|
||||
(assoc-in [:cursor :override] nil)
|
||||
(assoc-in [:cursor :was-active] (get-in entities [:cursor :active]))
|
||||
(assoc-in [:cursor :active] false)))))
|
||||
|
||||
(def default-night-merge {:r 0.08 :g 0.1 :b 0.36 :multiply-amount 1.0 :hue-amount 1.0})
|
||||
|
||||
Reference in New Issue
Block a user