Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

2015-03-18 15:53:29 -07:00
parent 8f3889c155 5cd6c108d4
commit 137a4e8430
14 changed files with 9 additions and 5 deletions
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -78,7 +78,7 @@
          interacting-entity (first (sort-by (comp - :baseline) (filter #(and (:mouse-in? %)
                                                                              (:get-script %)
                                                                              ((:mouse-in? %) entities x y))
-                                                                        (vals (get-in entities [:room :entities])))))
+                                                                        (vals (dissoc  (get-in entities [:room :entities]) :ego)))))
          current-action (get-in entities [:actions :current])
          
          ;; TODO - hacky way of resetting queue