distinguish container-sub-commands and container-dom-commands

[mudsync.git] / mudsync / room.scm

diff --git a/mudsync/room.scm b/mudsync/room.scm
index 877e2fa564589cff7a2ae5bf4353f618b1a82bc6..5c76977dac5106b35a4abd7cdf3ad5c9ebf56bbc 100644 (file)
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -19,6 +19,7 @@
 (define-module (mudsync room)
   #:use-module (mudsync command)
   #:use-module (mudsync gameobj)
+  #:use-module (mudsync utils)
   #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (oop goops)
@@ -59,18 +60,6 @@
 ;;; Rooms
 ;;; =====
 
-(define %room-contain-commands
-  (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)
-   (greedy-command "say" 'cmd-say)
-   (greedy-command "\"" 'cmd-say)
-   (greedy-command "'" 'cmd-say)
-   (greedy-command "emote" 'cmd-emote)
-   (greedy-command "/me" 'cmd-emote)))
-
 ;; TODO: Subclass from container?
 (define-class <room> (<gameobj>)
   ;; A list of <exit>
@@ -78,11 +67,19 @@
          #:init-keyword #:exits
          #:getter room-exits)
 
-  (container-commands
-   #:init-value (wrap %room-contain-commands))
+  (container-dom-commands
+   #:allocation #:each-subclass
+   #:init-thunk
+   (build-commands
+    ("look" ((loose-direct-command cmd-look-at)
+             (empty-command cmd-look-room)))
+    ("go" ((empty-command cmd-go-where)
+           (loose-direct-command cmd-go)))
+    (("say" "\"" "'") ((greedy-command cmd-say)))
+    (("emote" "/me") ((greedy-command cmd-emote)))))
 
   (actions #:allocation #:each-subclass
-           #:init-value
+           #:init-thunk
            (build-actions
             (cmd-go room-cmd-go)
             (cmd-go-where room-cmd-go-where)
@@ -189,10 +186,9 @@
    (lambda (return)
      (for-each
       (lambda (occupant)
-        (mbody-receive (_ #:key goes-by)
-            (<-wait occupant 'goes-by)
-          (if (member called-this goes-by)
-              (return occupant))))
+        (define goes-by (mbody-val (<-wait occupant 'goes-by)))
+        (if (ci-member called-this goes-by)
+            (return occupant)))
       (hash-map->list (lambda (key val) key)
                       (slot-ref room 'occupants)))
      #f)))
@@ -211,10 +207,8 @@
            (mbody-val (<-wait matching-object 'get-desc
                             #:whos-looking (message-from message)))))
       (if obj-desc
-          (<- (message-from message) 'tell
-              #:text (string-append obj-desc "\n"))
-          (<- (message-from message) 'tell
-              #:text (string-append %formless-desc "\n")))))
+          (<- (message-from message) 'tell #:text obj-desc)
+          (<- (message-from message) 'tell #:text %formless-desc))))
    (else
     (<- (message-from message) 'tell
         #:text "You don't see that here, so you can't look at it.\n"))))