minor fixes.

This commit is contained in:
2014-10-03 18:41:34 -07:00
parent f2d915a3f0
commit d672c7ab39
2 changed files with 4 additions and 3 deletions

View File

@@ -77,8 +77,9 @@
:on-touch-down (fn [screen [entities]] :on-touch-down (fn [screen [entities]]
(when (:shown? entities) (when (:shown? entities)
(run! @(resolve 'advent.screens.scene/scene) :on-reactivate) (run! @(resolve 'advent.screens.scene/scene) :on-reactivate)
(when-let [{:keys [highlighted-item]} entities] (let [{:keys [highlighted-item]} entities]
(run! @(resolve 'advent.screens.scene/scene) :on-chose-item :item highlighted-item)) (when highlighted-item
(run! @(resolve 'advent.screens.scene/scene) :on-chose-item :item highlighted-item)))
(-> entities (-> entities
(assoc :shown? false) (assoc :shown? false)
(assoc :start-showing? false)))) (assoc :start-showing? false))))

View File

@@ -461,7 +461,7 @@
(update! screen :renderer (stage) :camera (orthographic)) (update! screen :renderer (stage) :camera (orthographic))
(let [_ (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0) (let [_ (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0)
music (sound "town-music.mp3") music (sound "town-music.mp3")
;; _ (sound! music :loop 0.20) _ (sound! music :loop 0.20)
backgrounds (backgrounds screen)] backgrounds (backgrounds screen)]
{:backgrounds backgrounds {:backgrounds backgrounds
:state {:object nil :state {:object nil