From 30da6679cc5f3acc00c09b64a67fe69b17bd80a3 Mon Sep 17 00:00:00 2001
From: oakes <zsoakes@gmail.com>
Date: Sun, 29 Dec 2013 15:32:28 -0500
Subject: [PATCH] Clean up

---
 common/src/play_clj/core.clj   | 20 +++++++++++---------
 common/src/play_clj/render.clj |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/common/src/play_clj/core.clj b/common/src/play_clj/core.clj
index b224778..86c6371 100644
--- a/common/src/play_clj/core.clj
+++ b/common/src/play_clj/core.clj
@@ -31,7 +31,15 @@
         on-hide (or on-hide (fn [s]))
         on-pause (or on-pause (fn [s]))
         on-resize (or on-resize (fn [s w h]))
-        on-resume (or on-resume (fn [s]))]
+        on-resume (or on-resume (fn [s]))
+        add-entity (fn [entity]
+                     (->> entity
+                          (conj (:entities @screen))
+                          (swap! screen assoc :entities)))
+        del-entity (fn [entity]
+                     (->> (:entities @screen)
+                          (remove #(= % entity))
+                          (swap! screen assoc :entities)))]
     (proxy [Screen] []
       (show []
         (swap! screen assoc
@@ -39,14 +47,8 @@
                :camera (create-camera camera)
                :total-time 0
                :entities []
-               :add-entity (fn [entity]
-                             (->> entity
-                                  (conj (:entities @screen))
-                                  (swap! screen assoc :entities)))
-               :del-entity (fn [entity]
-                             (->> (:entities @screen)
-                                  (remove #(= % entity))
-                                  (swap! screen assoc :entities))))
+               :add-entity add-entity
+               :del-entity del-entity)
         (on-show @screen))
       (render [delta-time]
         (swap! screen assoc :total-time (+ (:total-time @screen) delta-time))
diff --git a/common/src/play_clj/render.clj b/common/src/play_clj/render.clj
index c3af4c8..668d282 100644
--- a/common/src/play_clj/render.clj
+++ b/common/src/play_clj/render.clj
@@ -59,7 +59,7 @@
 
 (defn draw-entities!
   ([screen]
-    (draw-entities! screen (-> screen :entities)))
+    (draw-entities! screen (:entities screen)))
   ([screen entities]
     (let [batch (sprite-batch screen)]
       (.begin batch)