X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Froom.scm;h=0ad886ceece07226a1dd508154c91c619535e4a1;hp=efb52d828e96efeda3c5d12e3ace6262f5f22b40;hb=754bd427883ab189433fad90293e05d9aced2f70;hpb=701425bc611abaa8b4140942d995d5f32d24e2d7

diff --git a/mudsync/room.scm b/mudsync/room.scm
index efb52d8..0ad886c 100644
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -105,28 +105,28 @@
                          (dyn-ref room (slot-ref exit 'to))
                          #f))
   (define player-name
-    (msg-val (<-wait room (message-from message) 'get-name)))
+    (msg-val (<-wait (message-from message) 'get-name)))
   (cond
    (exit
     ;; Set the player's new location
-    (<-wait room (message-from message) 'set-loc!
+    (<-wait (message-from message) 'set-loc!
             #:loc to-address)
     ;; Tell everyone else the person walked away
     (room-tell-room
      room
      (format #f "~a wanders ~a.\n"
              player-name direct-obj))
-    (<- room to-address 'announce-entrance
+    (<- to-address 'announce-entrance
         #:who-entered (message-from message))
     ;; Have the new room update the player to the new location
-    (<- room to-address 'look-room
+    (<- to-address 'look-room
         #:to-id (message-from message)))
    (else
-    (<- room (message-from message) 'tell
+    (<- (message-from message) 'tell
         #:text "You don't see any way to go there.\n"))))
 
 (define (room-cmd-go-where room message)
-  (<- room (message-from message) 'tell
+  (<- (message-from message) 'tell
       #:text "Go where?\n"))
 
 ;;; look commands
@@ -160,7 +160,7 @@
   (define occupant-names-all
     (map
      (lambda (occupant)
-       (call-with-message (<-wait room occupant 'visible-name
+       (call-with-message (<-wait occupant 'visible-name
                                   #:whos-looking player-id)
                           (lambda* (_ #:key text)
                             text)))
@@ -185,7 +185,7 @@
         (string-append room-text occupant-names-string)
         room-text))
   
-  (<- room player-id 'tell
+  (<- player-id 'tell
       #:text final-text))
 
 
@@ -203,7 +203,7 @@
      (for-each
       (lambda (occupant)
         (msg-receive (_ #:key goes-by)
-            (<-wait room occupant 'goes-by)
+            (<-wait occupant 'goes-by)
           (if (member called-this goes-by)
               (return occupant))))
       (hash-map->list (lambda (key val) key)
@@ -221,15 +221,15 @@
   (cond
    (matching-object
     (let ((obj-desc
-           (msg-val (<-wait room matching-object 'get-desc
+           (msg-val (<-wait matching-object 'get-desc
                             #:whos-looking (message-from message)))))
       (if obj-desc
-          (<- room (message-from message) 'tell
+          (<- (message-from message) 'tell
               #:text (string-append obj-desc "\n"))
-          (<- room (message-from message) 'tell
+          (<- (message-from message) 'tell
               #:text (string-append %formless-desc "\n")))))
    (else
-    (<- room (message-from message) 'tell
+    (<- (message-from message) 'tell
         #:text "You don't see that here, so you can't look at it.\n"))))
 
 
@@ -242,7 +242,7 @@
        (if wait
            <-wait
            <-))
-     (deliver-method room tell-me 'tell
+     (deliver-method tell-me 'tell
                      #:text text))
    who-to-tell))
 
@@ -255,8 +255,7 @@
 (define* (room-cmd-say room message #:key phrase)
   "Command: Say something to room participants."
   (define player-name
-    (msg-val (<-wait room (message-from message)
-                     'get-name)))
+    (msg-val (<-wait (message-from message) 'get-name)))
   (define message-to-send
     (format #f "~a says: ~a\n" player-name phrase))
   (room-tell-room room message-to-send))
@@ -264,15 +263,14 @@
 (define* (room-cmd-emote room message #:key phrase)
   "Command: Say something to room participants."
   (define player-name
-    (msg-val (<-wait room (message-from message)
-                     'get-name)))
+    (msg-val (<-wait (message-from message) 'get-name)))
   (define message-to-send
     (format #f "* ~a ~a\n" player-name phrase))
   (room-tell-room room message-to-send))
 
 (define* (room-announce-entrance room message #:key who-entered)
   (define player-name
-    (msg-val (<-wait room who-entered 'get-name)))
+    (msg-val (<-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