From e3ca0ff234716101bb727d825bbb5e5efec49850 Mon Sep 17 00:00:00 2001 From: oakes Date: Tue, 26 Aug 2014 18:36:11 -0400 Subject: [PATCH] Revert "Add :x and :y to screen map when necessary" This reverts commit 1c85268b955d4dce59274220a130af1ab5097f79. --- src/play_clj/core.clj | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/play_clj/core.clj b/src/play_clj/core.clj index 4241ffb..44f0d0e 100644 --- a/src/play_clj/core.clj +++ b/src/play_clj/core.clj @@ -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))