fixed sound problems.

This commit is contained in:
Bryce Covert
2015-10-26 15:08:51 +01:00
parent dc5c4d71d5
commit 4f281a0522
3 changed files with 19 additions and 12 deletions

View File

@@ -589,7 +589,7 @@
music
(time music)))
(defn transition-music [entities new-music & {:keys [duration]}]
(defn transition-music [entities new-music & {:keys [duration between]}]
(let [current-volume (atom 1.0)
duration (or duration 2.0)]
(run-action entities
@@ -608,8 +608,9 @@
:when m]
(music! m :stop))
(let [entities (-> entities
(assoc-in [:music-override :value] new-music)
(assoc-in [:volume :value] 1.0))]
((or between identity))
(assoc-in [:music-override :value] new-music)
(assoc-in [:volume :value] 1.0))]
(music! (utils/get-current-music entities) :set-volume (utils/current-music-volume))
(music! (utils/get-current-music entities) :play)
entities))