notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

override tweaks.

Browse Source
This commit is contained in:
Remington Covert
2014-12-15 07:10:06 -08:00
parent 089f9954be
commit 854e3c6b20
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/src-common/advent/actions.clj
View File

@@ -301,7 +301,7 @@
(begin [this screen entities]
(screen! dialogue/choice-screen :on-present-choices :choices dialogue-choices :callback #(reset! selected-index %))
(screen! @(resolve 'advent.screens.scene/scene) :on-deactivate)
entities)
(assoc-in entities [:cursor :override] nil))
(continue [this screen entities] entities)
@@ -446,7 +446,6 @@
music-changed? (not= old-music new-music)]
(run-action entities
(begin [this screen entities]
(-> entities
(assoc-in [:transition]
(assoc (texture "black.png")
@@ -479,7 +478,8 @@
apply-state (get-in entities [:room :apply-state])
entities (if apply-state
(apply-state entities)
entities)]
entities)
entities (utils/update-override entities)]
(when (not= new-music old-music)
(doseq [[k v] (:musics entities)
:when (and v (not= new-music k))]