various loading statements.

This commit is contained in:
Bryce Covert
2017-06-01 08:05:02 -07:00
parent 8d680eeaa6
commit d74604b578
29 changed files with 40 additions and 4 deletions

View File

@@ -58,6 +58,8 @@
#_(set! *unchecked-math* :warn-on-boxed)
(println "loading scene")
(declare hud)
(declare get-selected-inventory-item)
@@ -1429,8 +1431,8 @@
(assoc-in [:cursor :down-target] (or (:id interacting-entity ) (:id interaction) nil)))))))
:on-touch-up (fn [screen entities options]
(let [currently-pressed (dec (get-in entities [:cursor :counter]))
max-pressed (get-in entities [:cursor :max-counter])]
(let [currently-pressed (dec (get-in entities [:cursor :counter] 1))
max-pressed (get-in entities [:cursor :max-counter] 1)]
(println "touched up" currently-pressed max-pressed)
(cond
(and (<= currently-pressed 0)
@@ -1448,7 +1450,7 @@
(update-in [:cam] dissoc :start-zoom :pinching))
(get-in entities [:state :active?])
(update-in entities [:cursor :counter] #(max 0 (dec %)))
(update-in entities [:cursor :counter] #(max 0 (dec (or % 1))))
:else
entities