Mire: Multple players don't interfere with each other's rooms anymore

apauley · Dec 19, 2009 · f541b80 · f541b80
1 parent 68d55ae
commit f541b80
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/PeepCode/Clojure/mire/src/mire.clj b/PeepCode/Clojure/mire/src/mire.clj
@@ -1,5 +1,5 @@
 (ns mire
-  (:use [mire commands])
+  (:use [mire commands rooms])
   (:use [clojure.contrib server-socket duck-streams]))
 
 (def port 3333)
@@ -12,8 +12,10 @@
 (defn- mire-handle-client [in out]
   "Private function to handle client requests"
 
-  (binding [*in* (reader in) ; Re-assign stdin and stdout
-            *out* (writer out)]
+  ; Re-assign stdin and stdout
+  (binding [*in*           (reader in)
+            *out*          (writer out)
+            *current-room* (rooms :start)]
     (println (look))
     (print-prompt)
     (loop [input (read-line)]

diff --git a/PeepCode/Clojure/mire/src/mire/commands.clj b/PeepCode/Clojure/mire/src/mire/commands.clj
@@ -2,6 +2,11 @@
   (:use [mire rooms])
   (:use [clojure.contrib str-utils]))
 
+(defn look []
+  "Get a description of the current room"
+  (str (:desc *current-room*)
+       "\nExits: " (keys (:exits *current-room*))))
+
 (defn move
   "We gotta get out of this place... Give a direction."
   [direction]
@@ -12,17 +17,12 @@
           (look))
       "No way")))
 
-(defn look []
-  "Get a description of the current room"
-  (str (:desc *current-room*)
-       "\nExits: " (keys (:exits *current-room*))))
-
 (def commands {:move move,
-               :north (fn [] (move :north))
-               :east  (fn [] (move :east))
-               :south (fn [] (move :south))
-               :west  (fn [] (move :west))
-               :look  look
+               :north (fn [] (move :north)),
+               :east  (fn [] (move :east)),
+               :south (fn [] (move :south)),
+               :west  (fn [] (move :west)),
+               :look  look,
                :wtf   (fn []
                         "Yeah sure, I'll do that right after you grow a brain.")})
 

diff --git a/PeepCode/Clojure/mire/src/mire/rooms.clj b/PeepCode/Clojure/mire/src/mire/rooms.clj
@@ -6,7 +6,7 @@
       :closet {:desc "You are in a cramped closet. You feel a slight breeze."
                :exits {:south :start}}})
 
-(defn set-current-room [target]
-  (def *current-room* target))
+(def *current-room*)
 
-(set-current-room (rooms :start))
+(defn set-current-room [target]
+  (set! *current-room* target))