totally reworking music transitions.

This commit is contained in:
2015-02-11 19:29:20 -08:00
parent b4c0fdcc6e
commit 5fbb4f1f31
5 changed files with 62 additions and 40 deletions

View File

@@ -150,3 +150,12 @@
(and (:object e)
(< (:x e) x (+ (:x e) (or (:width e) (.getWidth (:object e)))))
(< (:y e) y (+ (:y e) (or (:height e) (.getHeight (:object e)))))))
(defn get-current-music [entities]
(let [time (get-in entities [:state :time])
musics (:musics entities)
override-music (musics (get-in entities [:music-override :value]))
current-music (musics (get-in entities [:room :music]))
current-time-music (musics (get-in entities [:room :music time]))]
(or override-music current-music current-time-music)))