From 6ec283b558e97a1865b7feeab0075d151b3a5579 Mon Sep 17 00:00:00 2001
From: oakes <zsoakes@gmail.com>
Date: Sat, 21 Jun 2014 08:28:56 -0400
Subject: [PATCH] Merge without losing entity type

---
 src/play_clj/entities.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/play_clj/entities.clj b/src/play_clj/entities.clj
index d83d867..3abd247 100644
--- a/src/play_clj/entities.clj
+++ b/src/play_clj/entities.clj
@@ -115,4 +115,4 @@
 (defrecord BundleEntity [entities] Entity
   (draw-entity! [{:keys [entities] :as entity} screen batch]
     (doseq [e entities]
-      (draw-entity! (merge (dissoc entity :entities) e) screen batch))))
+      (draw-entity! (merge e (apply dissoc entity (keys e))) screen batch))))