not failing from particle effects.

This commit is contained in:
2015-03-08 09:10:34 -07:00
parent cc2cb0e0a3
commit 9c9cf4b8b4
2 changed files with 4 additions and 3 deletions

View File

@@ -1 +1 @@
{:sound-volume 60.0, :music-volume 57.0}
{:sound-volume 60.0, :music-volume 74.0}

View File

@@ -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]]