refinement on closing.

This commit is contained in:
2014-12-23 15:44:36 -08:00
parent 3d41cb2cf9
commit 5a83a4a17d
32 changed files with 103 additions and 19 deletions

View File

@@ -241,7 +241,7 @@
(defn get-text-duration [text]
(* (count (s/split text #" ")) 0.5))
(defn talk [entities target-id text & {:keys [stop? animate?]}]
(defn talk [entities target-id text & {:keys [stop? animate? anim]}]
(let [initial-time (atom nil)
stop? (if (nil? stop?) true stop?)
animate? (if (nil? animate?) true animate?)]
@@ -267,7 +267,7 @@
:target-id target-id
:scale scale)
(if animate?
(update-in entities [:room :entities target-id ] #(start-animation screen % :talk))
(update-in entities [:room :entities target-id ] #(start-animation screen % (or anim :talk)))
entities)))
(continue [this screen entities] entities)