X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Froom.scm;h=403d610aab35a917b15349107c63af8e382588b6;hp=ba4af4c335e05abd81fd489450b6317c9caceffc;hb=refs%2Fheads%2F8sync-fibers;hpb=0327c09557568d1fefd7d642333c21c8a9f655db

diff --git a/mudsync/room.scm b/mudsync/room.scm
index ba4af4c..403d610 100644
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -154,7 +154,7 @@
                          #f))
   (define player (message-from message))
   (define player-name
-    (mbody-val (<-wait player 'get-name)))
+    (<-wait player 'get-name))
   (cond
    (exit
     (call-with-values (lambda ()
@@ -217,10 +217,12 @@
   (define occupant-names-all
     (map
      (lambda (occupant)
-       (call-with-message (<-wait occupant 'visible-name
-                                  #:whos-looking player-id)
-                          (lambda* (_ #:key text)
-                            text)))
+       (call-with-values
+           (lambda ()
+             (<-wait occupant 'visible-name
+                     #:whos-looking player-id))
+         (lambda* (#:key text)
+           text)))
      (remove
       (lambda (x) (equal? x player-id))
       (hash-map->list (lambda (x _) x)
@@ -261,7 +263,7 @@
    (lambda (return)
      (for-each
       (lambda (occupant)
-        (define goes-by (mbody-val (<-wait occupant 'goes-by)))
+        (define goes-by (<-wait occupant 'goes-by))
         (if (ci-member called-this goes-by)
             (return occupant)))
       (hash-map->list (lambda (key val) key)
@@ -296,7 +298,7 @@
 (define* (room-cmd-say room message #:key phrase)
   "Command: Say something to room participants."
   (define player-name
-    (mbody-val (<-wait (message-from message) 'get-name)))
+    (<-wait (message-from message) 'get-name))
   (define message-to-send
     `((b "<" ,player-name ">") " " ,phrase))
   (room-tell-room room message-to-send))
@@ -304,14 +306,14 @@
 (define* (room-cmd-emote room message #:key phrase)
   "Command: Say something to room participants."
   (define player-name
-    (mbody-val (<-wait (message-from message) 'get-name)))
+    (<-wait (message-from message) 'get-name))
   (define message-to-send
     `((b "* " ,player-name) " " ,phrase))
   (room-tell-room room message-to-send))
 
 (define* (room-announce-entrance room message #:key who-entered)
   (define player-name
-    (mbody-val (<-wait who-entered 'get-name)))
+    (<-wait who-entered 'get-name))
   (define message-to-send
     (format #f "~a enters the room.\n" player-name))
   (room-tell-room room message-to-send