totally reworking music transitions.
This commit is contained in:
@@ -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)))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user