X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fthing.scm;h=7b3a71d1538cc81c14693f3630ff88e866d22646;hp=a3ae6b003e3d706407252ca931e9f1fbd4d50a56;hb=6cff5b0062ef928204295ab4327bf2d417070421;hpb=b2f9a911ac1663fda4dc3cf18ade3334c01327b2 diff --git a/mudsync/thing.scm b/mudsync/thing.scm index a3ae6b0..7b3a71d 100644 --- a/mudsync/thing.scm +++ b/mudsync/thing.scm @@ -79,16 +79,16 @@ #:init-value (wrap-apply thing-dispatcher))) -(define-mhandler (thing-cmd-take thing message direct-obj) +(define* (thing-cmd-take thing message #:key direct-obj) (define player (message-from message)) (define player-name - (message-ref - (<-wait thing player 'get-name) - 'val)) + (msg-receive (_ #:key val) + (<-wait thing player 'get-name) + val)) (define player-loc - (message-ref - (<-wait thing player 'get-loc) - 'val)) + (msg-receive (_ #:key val) + (<-wait thing player 'get-loc) + val)) (define thing-name (slot-ref thing 'name)) (define should-take (slot-ref-maybe-runcheck thing 'takeable player)) @@ -108,16 +108,16 @@ #:text (format #f "It doesn't seem like you can pick up ~a.\n" thing-name)))) -(define-mhandler (thing-cmd-drop thing message direct-obj) +(define* (thing-cmd-drop thing message #:key direct-obj) (define player (message-from message)) (define player-name - (message-ref - (<-wait thing player 'get-name) - 'val)) + (msg-receive (_ #:key val) + (<-wait thing player 'get-name) + val)) (define player-loc - (message-ref - (<-wait thing player 'get-loc) - 'val)) + (msg-receive (_ #:key val) + (<-wait thing player 'get-loc) + val)) (define thing-name (slot-ref thing 'name)) (define should-drop (slot-ref-maybe-runcheck thing 'dropable player))