;; @@: Can remove this indirection once things settle
#:init-value (wrap-apply room-action-dispatch)))
-(define-mhandler (room-cmd-go room message direct-obj)
+(define* (room-cmd-go room message #:key direct-obj)
(define exit
(find
(lambda (exit)
(dyn-ref room (slot-ref exit 'to))
#f))
(define player-name
- (message-ref (<-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
(<- room (message-from message) 'tell
#:text "You don't see any way to go there.\n"))))
-(define-mhandler (room-cmd-go-where room message)
+(define (room-cmd-go-where room message)
(<- room (message-from message) 'tell
#:text "Go where?\n"))
(define occupant-names-all
(map
(lambda (occupant)
- (message-ref
- (<-wait room occupant 'visible-name
- #:whos-looking player-id)
- 'text))
+ (call-with-message (<-wait room occupant 'visible-name
+ #:whos-looking player-id)
+ (lambda* (_ #:key text)
+ text)))
(remove
(lambda (x) (equal? x player-id))
(hash-map->list (lambda (x _) x)
#:text final-text))
-(define-mhandler (room-look-room room message)
+(define* (room-look-room room message
+ ;; Either send it to the #:to-id of the message,
+ ;; or to the sender of the message
+ #:key (to-id (message-from message)))
"Command: Player asks to look around the room"
- (room-player-looks-around
- room
- ;; Either send it to the #:to-id of the message, or to the
- ;; sender of the message
- (message-ref message 'to-id
- (message-from message))))
+ (room-player-looks-around room to-id))
(define (room-find-thing-called room called-this)
"Find something called CALLED-THIS in the room, if any."
(lambda (return)
(for-each
(lambda (occupant)
- (define goes-by
- (message-ref (<-wait room occupant 'goes-by)
- 'goes-by #f))
- (if (member called-this goes-by)
- (return occupant)))
+ (msg-receive (_ #:key goes-by)
+ (<-wait room occupant 'goes-by)
+ (if (member called-this goes-by)
+ (return occupant))))
(hash-map->list (lambda (key val) key)
(slot-ref room 'occupants)))
#f)))
(define %formless-desc
"You don't see anything special.")
-(define-mhandler (room-look-at room message direct-obj)
+(define* (room-look-at room message #:key direct-obj)
"Look at a specific object in the room."
(define matching-object
(room-find-thing-called room direct-obj))
(cond
(matching-object
(let ((obj-desc
- (message-ref
- (<-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"))
#:text text))
who-to-tell))
-(define-mhandler (room-act-tell-room room message text)
+(define* (room-act-tell-room room message #:key text exclude wait)
"Tell the room some messages."
- (define exclude (message-ref message 'exclude #f))
- (define wait-delivery (message-ref message 'wait #f))
(room-tell-room room text
#:exclude exclude
- #:wait wait-delivery))
+ #:wait wait))
-(define-mhandler (room-cmd-say room message phrase)
+(define* (room-cmd-say room message #:key phrase)
"Command: Say something to room participants."
(define player-name
- (message-ref (<-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))
-(define-mhandler (room-cmd-emote room message phrase)
+(define* (room-cmd-emote room message #:key phrase)
"Command: Say something to room participants."
(define player-name
- (message-ref (<-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-mhandler (room-announce-entrance room message who-entered)
+(define* (room-announce-entrance room message #:key who-entered)
(define player-name
- (message-ref (<-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