Use msg-val everywhere and fix some definitions' argument lists.

[mudsync.git] / mudsync / room.scm

diff --git a/mudsync/room.scm b/mudsync/room.scm
index 2c19788034c3485245553e84278ac13490ac7efa..2ebced12060491561486f37fce574bb60caa452e 100644 (file)
--- a/mudsync/room.scm
+++ b/mudsync/room.scm
@@ -119,9 +119,7 @@
                          (dyn-ref room (slot-ref exit 'to))
                          #f))
   (define player-name
-    (msg-receive (_ #:key val)
-        (<-wait room (message-from message) 'get-name)
-      val))
+    (msg-val (<-wait room (message-from message) 'get-name)))
   (cond
    (exit
     ;; Set the player's new location
@@ -237,10 +235,8 @@
   (cond
    (matching-object
     (let ((obj-desc
-           (msg-receive (_ #:key val)
-               (<-wait room matching-object 'get-desc
-                       #:whos-looking (message-from message))
-             val)))
+           (msg-val (<-wait room matching-object 'get-desc
+                            #:whos-looking (message-from message)))))
       (if obj-desc
           (<- room (message-from message) 'tell
               #:text (string-append obj-desc "\n"))
@@ -273,10 +269,8 @@
 (define* (room-cmd-say room message #:key phrase)
   "Command: Say something to room participants."
   (define player-name
-    (msg-receive (_ #:key val)
-        (<-wait room (message-from message)
-                'get-name)
-      val))
+    (msg-val (<-wait room (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))
@@ -284,19 +278,15 @@
 (define* (room-cmd-emote room message #:key phrase)
   "Command: Say something to room participants."
   (define player-name
-    (msg-receive (_ #:key val)
-        (<-wait room (message-from message)
-                'get-name)
-      val))
+    (msg-val (<-wait room (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-receive (_ #:key val)
-        (<-wait room who-entered 'get-name)
-      val))
+    (msg-val (<-wait room who-entered 'get-name)))
   (define message-to-send
     (format #f "~a enters the room.\n" player-name))
   (room-tell-room room message-to-send