# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1350154532 14400
# Node ID 3152de9c4d387228c36fdd4a63a9e0ea36ac84f8
# Parent  f15b8173a1248b9e3bc2c8b3ab6f26982356ec73
Minor refactorings suggested by Gery Debongnie.

diff -r f15b8173a124 -r 3152de9c4d38 src/caves/core.clj
--- a/src/caves/core.clj	Sat Sep 01 23:18:31 2012 -0400
+++ b/src/caves/core.clj	Sat Oct 13 14:55:32 2012 -0400
@@ -23,12 +23,15 @@
 (defn run-game [game screen]
   (loop [{:keys [input uis] :as game} game]
     (when (seq uis)
-      (if (nil? input)
-        (let [game (update-in game [:world] tick-all)
-              _ (draw-game game screen)
-              game (clear-messages game)]
-          (recur (get-input game screen)))
-        (recur (process-input (dissoc game :input) input))))))
+      (recur (if input
+               (-> game
+                 (dissoc :input)
+                 (process-input input))
+               (-> game
+                 (update-in [:world] tick-all)
+                 (draw-game screen)
+                 (clear-messages)
+                 (get-input screen)))))))
 
 (defn new-game []
   (->Game nil [(->UI :start)] nil {:show-regions false}))
diff -r f15b8173a124 -r 3152de9c4d38 src/caves/ui/drawing.clj
--- a/src/caves/ui/drawing.clj	Sat Sep 01 23:18:31 2012 -0400
+++ b/src/caves/ui/drawing.clj	Sat Oct 13 14:55:32 2012 -0400
@@ -153,4 +153,5 @@
   (s/clear screen)
   (doseq [ui (:uis game)]
     (draw-ui ui game screen))
-  (s/redraw screen))
+  (s/redraw screen)
+  game)
diff -r f15b8173a124 -r 3152de9c4d38 src/caves/utils.clj
--- a/src/caves/utils.clj	Sat Sep 01 23:18:31 2012 -0400
+++ b/src/caves/utils.clj	Sat Oct 13 14:55:32 2012 -0400
@@ -28,4 +28,4 @@
 
 
 (defn enumerate [s]
-  (map vector (iterate inc 0) s))
+  (map-indexed vector s))