From 00e522948a4357bf1eb475f046f9bb0a2c558df7 Mon Sep 17 00:00:00 2001 From: oakes Date: Tue, 26 Aug 2014 20:40:59 -0400 Subject: [PATCH] Revert "Add :x and :y to all screen maps" This reverts commit 94bf3807eaa488e76859c2d916192b5447d05f97. --- 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 b9f33fd..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 merge-coords - [{:keys [input-x input-y] :as screen}] - (let [x (or input-x (game :x)) - y (or input-y (game :y))] - (merge screen (input->screen screen x y)))) - (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 (merge-coords (merge @screen options)) + (let [screen-map (merge @screen options) old-entities @entities] (some->> (with-meta #(normalize (func screen-map old-entities))