X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=mudsync%2Froom.scm;h=2e1b99fcdf1d8f94e4712e36736db572e42bb7e3;hb=4ea75c3db75e83c8133e2833d0ad7820aacc30b7;hp=4e5fd9e9e23909303b0fba8cbeed342bbe2741cc;hpb=8c357c87019a70aabdfadb4c71e3b063251cff87;p=mudsync.git

diff --git a/mudsync/room.scm b/mudsync/room.scm
index 4e5fd9e..2e1b99f 100644
--- 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.
@@ -71,8 +69,23 @@
   (list
    (loose-direct-command "look" 'cmd-look-at)
    (empty-command "look" 'cmd-look-room)
+   (empty-command "go" 'cmd-go-where)
    (loose-direct-command "go" 'cmd-go)))
 
+(define room-actions
+  (build-actions
+   ;; desc == description
+   (wire-exits! (wrap-apply room-wire-exits!))
+   (cmd-go (wrap-apply room-cmd-go))
+   (cmd-go-where (wrap-apply room-cmd-go-where))
+   (cmd-look-room (wrap-apply room-cmd-look-room))))
+
+(define room-actions*
+  (append room-actions gameobj-actions))
+
+(define room-action-dispatch
+  (simple-dispatcher room-actions*))
+
 ;; TODO: Subclass from container?
 (define-class <room> (<gameobj>)
   ;; A list of <exit>
@@ -81,7 +94,7 @@
          #:getter room-exits)
 
   (container-commands
-   #:init-value %room-contain-commands)
+   #:init-value (wrap %room-contain-commands))
 
   (message-handler
    #:allocation #:each-subclass
@@ -89,29 +102,18 @@
    #:init-value (wrap-apply room-action-dispatch)))
 
 
-(define room-actions
-  (build-actions
-   ;; desc == description
-   (wire-exits! (wrap-apply room-wire-exits!))
-   (cmd-go (wrap-apply room-cmd-go))))
-
-(define room-actions*
-  (append room-actions gameobj-actions))
-
-(define room-action-dispatch
-  (simple-dispatcher room-actions*))
-
-
 (define (room-wire-exits! room message)
   "Actually hook up the rooms' exit addresses to the rooms they
 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 +122,19 @@ 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 "You don't see any way to go there.\n"))))
+
+(define-mhandler (room-cmd-go-where room message)
+  (<- room (message-from message) 'tell
+      #:text "Go where?\n"))
+
+(define-mhandler (room-cmd-look-room room message)
+  (<- room (message-from message) 'look-room))