refactoring commands slots

[mudsync.git] / mudsync.scm

diff --git a/mudsync.scm b/mudsync.scm
index a15f5b9a02ea2a1f221129e2078832c9e18f3bde..35cc0befcf641f3da7b286e831656d6e98d7ed71 100644 (file)
--- a/mudsync.scm
+++ b/mudsync.scm
@@ -398,7 +398,9 @@ with an anonymous persona"
            #:init-value '())
 
   ;; Commands we can handle
            #:init-value '())
 
   ;; Commands we can handle

-  (commands #:init-value #f)
+  (dirobj-commands #:init-value '())
+  (indirobj-commands #:init-value '())
+

   ;; Commands we can handle by being something's container
   (contain-commands #:init-value #f))
 
   ;; Commands we can handle by being something's container
   (contain-commands #:init-value #f))
 


@@ -489,10 +491,10 @@ with an anonymous persona"
 
 (define %room-contain-commands
   (list
 
 (define %room-contain-commands
   (list

-   (command "look" cmatch-just-verb always 'look-room)
-   (command "look" cmatch-direct-obj always 'look-member)
-   (command "go" cmathc-just-verb always 'go-where)
-   (command "go" cmatch-direct-obj always 'go-exit)))
+   (full-command "look" cmatch-just-verb always 'look-room)
+   (full-command "look" cmatch-direct-obj always 'look-member)
+   (full-command "go" cmathc-just-verb always 'go-where)
+   (full-command "go" cmatch-direct-obj always 'go-exit)))

 
 
 (define (room-wire-exits! room message)
 
 
 (define (room-wire-exits! room message)


@@ -520,7 +522,7 @@ claim to point to."
   (client #:accessor player-client)
 
   (self-commands
   (client #:accessor player-client)
 
   (self-commands

-   #:init-value #f  ; TODO: Set me to a reasonable default
+   #:init-value '()

    #:accessor player-self-commands)
 
   (message-handler
    #:accessor player-self-commands)
 
   (message-handler