We can finally move around!

[mudsync.git] / mudsync / room.scm

diff --git a/mudsync/room.scm b/mudsync/room.scm
index 4e5fd9e9e23909303b0fba8cbeed342bbe2741cc..5c93be3d5b615e666d789177b2cf1c4001b0a7e3 100644 (file)
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -35,16 +35,14 @@
 
 (define-class <exit> ()
   ;; Used for wiring
-  (to-symbol #:accessor exit-to-symbol
-             #:init-keyword #:to-symbol)
+  (to-symbol #:init-keyword #:to-symbol)
   ;; The actual address we use
-  (to-address #:accessor exit-to-address
-              #:init-keyword #:address)
+  (to-address #:init-keyword #:address)
   ;; Name of the room (@@: Should this be names?)
-  (name #:accessor exit-name
+  (name #:getter exit-name
         #:init-keyword #:name)
-  (desc #:accessor exit-desc
-               #:init-keyword #:desc)
+  (desc #:init-keyword #:desc
+        #:init-value #f)
 
   ;; *Note*: These two methods have an extra layer of indirection, but
   ;;   it's for a good reason.
@@ -108,10 +106,12 @@ claim to point to."
   (for-each
    (lambda (exit)
      (define new-exit
-       (<-wait room (gameobj-gm room) 'lookup-room
-               #:symbol (exit-to-symbol exit)))
+       (message-ref
+        (<-wait room (gameobj-gm room) 'lookup-room
+                #:symbol (slot-ref exit 'to-symbol))
+        'room-id))
 
-     (set! (exit-to-address exit) new-exit))
+     (slot-set! exit 'to-address new-exit))
 
    (room-exits room)))
 
@@ -120,10 +120,12 @@ claim to point to."
     (find
      (lambda (exit)
        (equal? (exit-name exit) direct-obj))
-     (pk 'later-exits (room-exits room))))
-  (if exit
-      (<- room (message-from message) 'tell
-          #:text "Yeah you can go there...\n")
-      (<- room (message-from message) 'tell
-          #:text "I don't know where that is?\n")))
-
+     (room-exits room)))
+  (cond
+   (exit
+    (<-wait room (message-from message) 'set-loc!
+            #:loc (slot-ref exit 'to-address))
+    (<- room (message-from message) 'look-room))
+   (else
+    (<- room (message-from message) 'tell
+        #:text "I don't know where that is?\n"))))