minor tweak.
This commit is contained in:
@@ -335,11 +335,7 @@
|
|||||||
(render! screen (sort-by :z (filter :object (vals entities))) )
|
(render! screen (sort-by :z (filter :object (vals entities))) )
|
||||||
entities))
|
entities))
|
||||||
|
|
||||||
:show-screen (fn [entities]
|
:show-screen (fn [entities] entities)
|
||||||
entities)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
:on-key-up
|
:on-key-up
|
||||||
(fn [screen entities]
|
(fn [screen entities]
|
||||||
@@ -349,68 +345,55 @@
|
|||||||
|
|
||||||
:on-ui-changed
|
:on-ui-changed
|
||||||
(fn [{:keys [actor] :as screen} [entities]]
|
(fn [{:keys [actor] :as screen} [entities]]
|
||||||
(let [e (-> actor .getUserObject)
|
(when-not (get-in entities [:tweens :fade-out])
|
||||||
actor-key (:key e)]
|
|
||||||
|
|
||||||
(cond
|
(let [e (-> actor .getUserObject)
|
||||||
|
actor-key (:key e)]
|
||||||
|
|
||||||
|
(cond
|
||||||
|
|
||||||
(= :music-volume-slider actor-key)
|
(= :music-volume-slider actor-key)
|
||||||
(do (swap! utils/settings assoc :music-volume (slider! e :get-value))
|
(do (swap! utils/settings assoc :music-volume (slider! e :get-value))
|
||||||
(utils/save-settings!)
|
(utils/save-settings!)
|
||||||
entities)
|
entities)
|
||||||
|
|
||||||
(= :sound-volume-slider actor-key)
|
(= :sound-volume-slider actor-key)
|
||||||
(do (swap! utils/settings assoc :sound-volume (slider! e :get-value))
|
(do (swap! utils/settings assoc :sound-volume (slider! e :get-value))
|
||||||
(utils/save-settings!)
|
(utils/save-settings!)
|
||||||
entities)
|
entities)
|
||||||
|
|
||||||
(#{:back } actor-key)
|
(#{:back } actor-key)
|
||||||
(-> entities
|
(-> entities
|
||||||
(dissoc :save-menu)
|
(dissoc :save-menu)
|
||||||
(assoc :main-menu (main-menu)))
|
(assoc :main-menu (main-menu)))
|
||||||
|
|
||||||
(= :chapters actor-key)
|
(= :chapters actor-key)
|
||||||
(-> entities
|
(-> entities
|
||||||
(dissoc :main-menu)
|
(dissoc :main-menu)
|
||||||
(assoc :save-menu (saves-menu entities)))
|
(assoc :save-menu (saves-menu entities)))
|
||||||
|
|
||||||
(= :toggle-fullscreen actor-key)
|
(= :toggle-fullscreen actor-key)
|
||||||
(utils/toggle-fullscreen!)
|
(utils/toggle-fullscreen!)
|
||||||
|
|
||||||
(= :end-quest actor-key)
|
(= :end-quest actor-key)
|
||||||
(quit screen entities)
|
(quit screen entities)
|
||||||
|
|
||||||
(= :continue-or-start actor-key)
|
(= :continue-or-start actor-key)
|
||||||
(start-playing screen entities (if (= "Begin quest" (quest-label))
|
(start-playing screen entities (if (= "Begin quest" (quest-label))
|
||||||
nil
|
nil
|
||||||
:autosave))
|
:autosave))
|
||||||
|
|
||||||
(= :continue actor-key)
|
(= :continue actor-key)
|
||||||
(start-playing screen entities (saves/name->save (:selected-save entities)))
|
(start-playing screen entities (saves/name->save (:selected-save entities)))
|
||||||
|
|
||||||
(:save e)
|
(:save e)
|
||||||
(do
|
(do
|
||||||
(label! (-> entities :save-menu :save-label) :set-text (:save e))
|
(label! (-> entities :save-menu :save-label) :set-text (:save e))
|
||||||
(text-button! (-> entities :save-menu :continue-button) :set-disabled false)
|
(text-button! (-> entities :save-menu :continue-button) :set-disabled false)
|
||||||
(assoc entities :selected-save (:save e)))
|
(assoc entities :selected-save (:save e)))
|
||||||
|
|
||||||
:else
|
:else
|
||||||
entities)))
|
entities))))
|
||||||
|
|
||||||
:on-touch-up (fn [screen [{:keys [prev next saves-list save-index] :as entities}]]
|
|
||||||
(when-not (get-in entities [:tweens :fade-out])
|
|
||||||
(let [[x y] (utils/unproject screen)
|
|
||||||
selected-save (get-selected-save entities [x y])]
|
|
||||||
(cond
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
selected-save
|
|
||||||
(start-playing screen entities (:save selected-save))
|
|
||||||
|
|
||||||
:else
|
|
||||||
nil))))
|
|
||||||
|
|
||||||
|
|
||||||
:on-resize (fn [{:keys [viewport width height]} [entities]]
|
:on-resize (fn [{:keys [viewport width height]} [entities]]
|
||||||
(.update viewport width height false)
|
(.update viewport width height false)
|
||||||
|
|||||||
Reference in New Issue
Block a user