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

[mudsync.git] / mudsync / thing.scm

diff --git a/mudsync/thing.scm b/mudsync/thing.scm
index 7b3a71d1538cc81c14693f3630ff88e866d22646..762775d318a6a16a1ab85a2d65ab49c4c4e63654 100644 (file)
--- a/mudsync/thing.scm
+++ b/mudsync/thing.scm
@@ -82,13 +82,9 @@
 (define* (thing-cmd-take thing message #:key direct-obj)
   (define player (message-from message))
   (define player-name
-    (msg-receive (_ #:key val)
-        (<-wait thing player 'get-name)
-      val))
+    (msg-val (<-wait thing player 'get-name)))
   (define player-loc
-    (msg-receive (_ #:key val)
-        (<-wait thing player 'get-loc)
-      val))
+    (msg-val (<-wait thing player 'get-loc)))
   (define thing-name (slot-ref thing 'name))
   (define should-take
     (slot-ref-maybe-runcheck thing 'takeable player))
@@ -111,13 +107,9 @@
 (define* (thing-cmd-drop thing message #:key direct-obj)
   (define player (message-from message))
   (define player-name
-    (msg-receive (_ #:key val)
-        (<-wait thing player 'get-name)
-      val))
+    (msg-val (<-wait thing player 'get-name)))
   (define player-loc
-    (msg-receive (_ #:key val)
-        (<-wait thing player 'get-loc)
-      val))
+    (msg-val (<-wait thing player 'get-loc)))
   (define thing-name (slot-ref thing 'name))
   (define should-drop
     (slot-ref-maybe-runcheck thing 'dropable player))