Make commands use the inheritable rmeta-slot tooling

[mudsync.git] / mudsync / room.scm

diff --git a/mudsync/room.scm b/mudsync/room.scm
index 6efac433f4c34b895c31a738511a53ac602ec3d7..1e0f354ec0cc01a74f51235f3b9de953a92a80bb 100644 (file)
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -59,18 +59,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>
@@ -79,10 +67,18 @@
          #:getter room-exits)
 
   (container-commands
-   #:init-value (wrap %room-contain-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)
@@ -134,23 +130,6 @@
 
 ;;; look commands
 
-(define (list-words-as-string words)
-  "A little utility for listing a bunch of words in an English-style list"
-  ;; TODO: This could be made faster by traversing the O(n)
-  ;;   list once, not twice
-  (let ((word-length (length words)))
-    (cond 
-     ((eqv? word-length 0) "")
-     ((eqv? word-length 1) (car words))
-     (else
-      ;; TODO: and this is NOT efficient
-      (string-append
-       (string-join
-        (drop-right words 1)
-        ", ")
-       " and "
-       (last words))))))
-
 (define (room-player-looks-around room player-id)
   "Handle looking around the room"
   ;; Get the room text
@@ -180,12 +159,13 @@
     (if (eq? occupant-names-filtered '())
         #f
         (format #f "You see here: ~a.\n"
-                (list-words-as-string occupant-names-filtered))))
+                (string-join occupant-names-filtered
+                             ", "))))
 
   (define final-text
     (if occupant-names-string
         `(,@room-text
-          (p (i ,occupant-names-string)))
+          (p (em ,occupant-names-string)))
         room-text))
   
   (<- player-id 'tell
@@ -227,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"))))