several nice tweaks.

This commit is contained in:
2016-01-07 21:22:43 -08:00
parent 9019166c7e
commit 7dab5867c8
4 changed files with 38 additions and 27 deletions

View File

@@ -101,12 +101,14 @@
(utils/save @~entities "autosave" "Autosave"))))))))
(defn force-end [entities current-action key]
(do (put! (get-channel current-action) :end)
(do (when current-action
(put! (get-channel current-action) :end))
(screen! dialogue/talking-screen :stop-talk :id key)
(-> entities
(assoc-in [key :script-running?] false)
(assoc-in [key :current] nil)
(assoc-in [key :started?] false))))
(assoc-in [key :started?] false)
(assoc-in [key :channel] (chan)))))
(defmacro get-unsaved-script [entities & forms]
`(fn [starting-entities#]