X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=mudsync%2Froom.scm;h=0379d3da71d268586f42c0d22c594b99e7ef04c2;hb=4070fd4d76faaab3a07a055c21f30e0481310105;hp=1e0f354ec0cc01a74f51235f3b9de953a92a80bb;hpb=4d4af0656b0402e630eea9393420197152945e5b;p=mudsync.git diff --git a/mudsync/room.scm b/mudsync/room.scm index 1e0f354..0379d3d 100644 --- a/mudsync/room.scm +++ b/mudsync/room.scm @@ -19,6 +19,7 @@ (define-module (mudsync room) #:use-module (mudsync command) #:use-module (mudsync gameobj) + #:use-module (mudsync utils) #:use-module (8sync actors) #:use-module (8sync agenda) #:use-module (oop goops) @@ -66,11 +67,11 @@ #:init-keyword #:exits #:getter room-exits) - (container-commands + (container-dom-commands #:allocation #:each-subclass #:init-thunk (build-commands - ("look" ((loose-direct-command cmd-look-at) + (("l" "look") ((loose-direct-command cmd-look-at) (empty-command cmd-look-room))) ("go" ((empty-command cmd-go-where) (loose-direct-command cmd-go))) @@ -185,10 +186,9 @@ (lambda (return) (for-each (lambda (occupant) - (mbody-receive (_ #:key goes-by) - (<-wait occupant 'goes-by) - (if (member called-this goes-by) - (return occupant)))) + (define goes-by (mbody-val (<-wait occupant 'goes-by))) + (if (ci-member called-this goes-by) + (return occupant))) (hash-map->list (lambda (key val) key) (slot-ref room 'occupants))) #f)))