projects
/
mudsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
distinguish container-sub-commands and container-dom-commands
[mudsync.git]
/
mudsync
/
room.scm
diff --git
a/mudsync/room.scm
b/mudsync/room.scm
index 1e0f354ec0cc01a74f51235f3b9de953a92a80bb..5c76977dac5106b35a4abd7cdf3ad5c9ebf56bbc 100644
(file)
--- a/
mudsync/room.scm
+++ b/
mudsync/room.scm
@@
-19,6
+19,7
@@
(define-module (mudsync room)
#:use-module (mudsync command)
#:use-module (mudsync gameobj)
(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)
#:use-module (8sync actors)
#:use-module (8sync agenda)
#:use-module (oop goops)
@@
-66,7
+67,7
@@
#:init-keyword #:exits
#:getter room-exits)
#:init-keyword #:exits
#:getter room-exits)
- (container-commands
+ (container-
dom-
commands
#:allocation #:each-subclass
#:init-thunk
(build-commands
#:allocation #:each-subclass
#:init-thunk
(build-commands
@@
-185,10
+186,9
@@
(lambda (return)
(for-each
(lambda (occupant)
(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)))
(hash-map->list (lambda (key val) key)
(slot-ref room 'occupants)))
#f)))