notid/play-clj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 1c85268b95.
This commit is contained in:
oakes
2014-08-26 18:36:11 -04:00
parent 1c85268b95
commit e3ca0ff234
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/play_clj/core.clj
View File

@@ -61,19 +61,13 @@
[screen screen-fn] [screen screen-fn]
(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* (defn defscreen*
[{:keys [screen entities [{:keys [screen entities
on-show on-render on-hide on-pause on-resize on-resume on-timer] on-show on-render on-hide on-pause on-resize on-resume on-timer]
:as options}] :as options}]
(let [execute-fn! (fn [func & {:keys [] :as options}] (let [execute-fn! (fn [func & {:keys [] :as options}]
(when func (when func
(let [screen-map (add-coords (merge @screen options)) (let [screen-map (merge @screen options)
old-entities @entities] old-entities @entities]
(some->> (with-meta (some->> (with-meta
#(normalize (func screen-map old-entities)) #(normalize (func screen-map old-entities))