Update codebase to use 8sync-fibers

[mudsync.git] / mudsync / player.scm

diff --git a/mudsync/player.scm b/mudsync/player.scm
index 78d9a01574efbed2f113f8e9f18fbd1d1e53cf63..feea1ef5bbbf5454c8a1cd2deb05b7995e6cc728 100644 (file)
--- a/mudsync/player.scm
+++ b/mudsync/player.scm
@@ -21,6 +21,7 @@
   #:use-module (mudsync gameobj)
   #:use-module (mudsync game-master)
   #:use-module (mudsync parser)
+  #:use-module (mudsync receive-star)
   #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (8sync rmeta-slot)
@@ -100,7 +101,7 @@
   (define inv-names
     (map
      (lambda (inv-item)
-       (mbody-val (<-wait inv-item 'get-name)))
+       (<-wait inv-item 'get-name))
      (gameobj-occupants player)))
   (define text-to-show
     (if (eq? inv-names '())
@@ -150,14 +151,14 @@
   ;; Ask the room for its commands
   (define room-dom-commands
     ;; TODO: Map room id and sort
-    (mbody-receive (_ #:key commands)
+    (receive* (#:key commands)
         (<-wait player-loc 'get-container-dom-commands
                 #:verb verb)
       commands))
 
   (define room-sub-commands
     ;; TODO: Map room id and sort
-    (mbody-receive (_ #:key commands)
+    (receive* (#:key commands)
         (<-wait player-loc 'get-container-sub-commands
                 #:verb verb)
       commands))
@@ -166,7 +167,7 @@
   (define co-occupants
     (remove
      (lambda (x) (equal? x (actor-id player)))
-     (mbody-val (<-wait player-loc 'get-occupants))))
+     (<-wait player-loc 'get-occupants)))
 
   ;; @@: There's a race condition here if someone leaves the room
   ;;   during this, heh...
@@ -177,7 +178,7 @@
   (define co-occupant-commands
     (fold
      (lambda (co-occupant prev)
-       (mbody-receive (_ #:key commands goes-by)
+       (receive* (#:key commands goes-by)
            (<-wait co-occupant 'get-commands
                    #:verb verb)
          (append
@@ -199,7 +200,7 @@
   (define inv-item-commands
     (fold
      (lambda (inv-item prev)
-       (mbody-receive (_ #:key commands goes-by)
+       (receive* (#:key commands goes-by)
            (<-wait inv-item 'get-contained-commands
                    #:verb verb)
          (append