Revert "Add :x and :y to screen map when necessary"

This reverts commit 1c85268b95.
This commit is contained in:
oakes
2014-08-26 18:36:11 -04:00
parent 1c85268b95
commit e3ca0ff234

View File

@@ -61,19 +61,13 @@
[screen screen-fn]
(screen-fn))
(defn ^:private add-coords
[{:keys [input-x input-y] :as screen}]
(if (and input-x input-y)
(merge screen (input->screen screen input-x input-y))
screen))
(defn defscreen*
[{:keys [screen entities
on-show on-render on-hide on-pause on-resize on-resume on-timer]
:as options}]
(let [execute-fn! (fn [func & {:keys [] :as options}]
(when func
(let [screen-map (add-coords (merge @screen options))
(let [screen-map (merge @screen options)
old-entities @entities]
(some->> (with-meta
#(normalize (func screen-map old-entities))