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

[mudsync.git] / mudsync / gameobj.scm

diff --git a/mudsync/gameobj.scm b/mudsync/gameobj.scm
index 8b1040fbcaee86df2aab20369c0ecd6db7486f79..32506803cfa43bbf71cd764caf3a458122e76de4 100644 (file)
--- a/mudsync/gameobj.scm
+++ b/mudsync/gameobj.scm
@@ -127,8 +127,7 @@
 ;; Kind of a useful utility, maybe?
 (define (simple-slot-getter slot)
   (lambda (actor message)
-    (<-reply actor message
-                   #:val (slot-ref actor slot))))
+    (<-reply actor message (slot-ref actor slot))))
 
 (define (gameobj-replace-step-occupants actor occupants)
   ;; Snarf all the occupants!
@@ -249,8 +248,7 @@ Assists in its replacement of occupants if necessary and nothing else."
            #:occupants occupants))
 
 (define (gameobj-act-get-loc actor message)
-  (<-reply actor message
-           #:val (slot-ref actor 'loc)))
+  (<-reply actor message (slot-ref actor 'loc)))
 
 (define (gameobj-set-loc! gameobj loc)
   "Set the location of this object."
@@ -281,7 +279,7 @@ and whos-asking, and see if we should just return it or run it."
 
 (define gameobj-get-name (simple-slot-getter 'name))
 
-(define* (gameobj-act-set-name! actor message #:key val)
+(define* (gameobj-act-set-name! actor message val)
   (slot-set! actor 'name val))
 
 (define* (gameobj-get-desc actor message #:key whos-looking)
@@ -290,7 +288,7 @@ and whos-asking, and see if we should just return it or run it."
       ((? procedure? desc-proc)
        (desc-proc actor whos-looking))
       (desc desc)))
-  (<-reply actor message #:val desc-text))
+  (<-reply actor message desc-text))
 
 (define (gameobj-visible-to-player? gameobj whos-looking)
   "Check to see whether we're visible to the player or not.
@@ -356,10 +354,8 @@ By default, this is whether or not the generally-visible flag is set."
   (match special-symbol
     ;; if it's a symbol, look it up dynamically
     ((? symbol? _)
-     (msg-receive (_ #:key val)
-         (<-wait gameobj (slot-ref gameobj 'gm) 'lookup-special
-                 #:symbol special-symbol)
-       val))
+     (msg-val (<-wait gameobj (slot-ref gameobj 'gm) 'lookup-special
+                      #:symbol special-symbol)))
     ;; if it's false, return nothing
     (#f #f)
     ;; otherwise it's probably an address, return it as-is