diff --git a/desktop/settings.edn b/desktop/settings.edn index d6118f6b..09d1d4be 100644 --- a/desktop/settings.edn +++ b/desktop/settings.edn @@ -1 +1 @@ -{:sound-volume 60.0, :music-volume 57.0} \ No newline at end of file +{:sound-volume 60.0, :music-volume 74.0} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms.clj b/desktop/src-common/advent/screens/rooms.clj index 4a8ad47f..05cee966 100644 --- a/desktop/src-common/advent/screens/rooms.clj +++ b/desktop/src-common/advent/screens/rooms.clj @@ -10,8 +10,9 @@ (merge entity {:mouse-in? (fn [entities x y] (let [{entity-x :x entity-y :y width :width scale-x :scale-x scale-y :scale-y height :height region :object} (get-in entities [:room :entities id]) - width (or width (if (isa? TextureRegion region) (.getRegionWidth region) 0)) - height (or height (if (isa? TextureRegion region) (.getRegionHeight region) 0))] + + width (or width (if (instance? TextureRegion region ) (.getRegionWidth region) 0)) + height (or height (if (instance? TextureRegion region ) (.getRegionHeight region) 0))] ((zone/box entity-x entity-y (+ entity-x (* width (or 1 scale-x))) (+ entity-y (* height (or scale-y 1)))) x y)))} (when (or (:scripts entity) (:script entity)) {:get-script (fn [cursor [x y]]