Mire: give preference to passing refs around that can be dereffed whe…

…n necessary
apauley · Dec 24, 2009 · 19b201b · 19b201b
1 parent fe8dd4b
commit 19b201b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/PeepCode/Clojure/mire/src/mire/commands.clj b/PeepCode/Clojure/mire/src/mire/commands.clj
@@ -6,8 +6,8 @@
   "Get a description of the current room"
   (str "\n"
        (:desc @(current-room))
-       "\nInhabitants: " (current-inhabitants)
-       "\nItems: "       (current-items)
+       "\nInhabitants: " @(current-inhabitants)
+       "\nItems: "       @(current-items)
        "\nExits: " (keys (:exits @(current-room)))))
 
 (defn move

diff --git a/PeepCode/Clojure/mire/src/mire/rooms.clj b/PeepCode/Clojure/mire/src/mire/rooms.clj
@@ -25,11 +25,11 @@
 
 (defn current-inhabitants []
   "Returns the inhabitants in the current room"
-  @(:inhabitants @(current-room)))
+  (:inhabitants @(current-room)))
 
 (defn current-items []
   "Returns the items available in the current room"
-  @(:items @(current-room)))
+  (:items @(current-room)))
 
 (defn room-contains? [room thing]
   (@(:items room) (keyword thing)))