diff --git a/desktop/settings.edn b/desktop/settings.edn index 4d6d5fb2..8b989154 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 64.0, :music-volume 0.0} \ No newline at end of file +{:sound-volume 42.0, :music-volume 59.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 093031fb..4b624bd7 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -52,11 +52,10 @@ v (vector-2 0 0) a (catmull-rom-spline! (:path (:flying-ego entities)) :value-at v pos-f) direction (get-dir (get-in entities [:flying-ego :x]) (vector-2! v :x))] - (merge (update-in entities [:flying-ego] - merge {:x (vector-2! v :x) - :y (vector-2! v :y)} - (get-in entities [:flying-ego direction]) - )))) + (update-in entities [:flying-ego] + merge {:x (vector-2! v :x) + :y (vector-2! v :y)} + (get-in entities [:flying-ego direction])))) (defn flip [t] (let [flipped (texture t)]