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

progress on multiple scripts.

Browse Source
This commit is contained in:
Bryce Covert
2015-11-19 18:29:54 -08:00
parent 624688524b
commit 5b12127ae3
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
desktop/src-common/advent/screens/scene.clj
View File

@@ -189,6 +189,8 @@ void main ()
(assoc-in [:cursor :override] nil)))
(assoc-in entities [:cursor :current] :main))))
(defn skip-action [screen entities]
(let [current-action (get-in entities [:fg-actions :current])]
(cond (= :skip (actions/skip-type current-action screen entities))
@@ -201,11 +203,8 @@ void main ()
(= :end (actions/skip-type current-action screen entities))
(let [terminated-entities (actions/terminate current-action screen entities)]
(println "trying to end")
(do (put! (actions/get-channel current-action) :end)
(-> terminated-entities
(assoc-in [:fg-actions :script-running?] false)
(assoc-in [:fg-actions :current] nil)
(assoc-in [:fg-actions :started?] false))))
(actions/force-end terminated-entities current-action :fg-actions)
)
:else
entities)))