moving between rooms nearly works

[mudsync.git] / mudsync / game-master.scm

diff --git a/mudsync/game-master.scm b/mudsync/game-master.scm
index 0abadb360fbad56574c2c471cc4ef00cb8cd370b..595a9032ee391b9dc1b29dc6e4b361750490ca92 100644 (file)
--- a/mudsync/game-master.scm
+++ b/mudsync/game-master.scm
@@ -17,7 +17,6 @@
 ;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (mudsync game-master)
-  #:use-module (mudsync room)
   #:use-module (mudsync networking)
   #:use-module (8sync systems actors)
   #:use-module (8sync agenda)
@@ -86,7 +85,7 @@
     "Take room exits syntax from the spec, turn it into exits"
     (match exit-spec
       ((name to-symbol desc)
-       (make <exit>
+       (make (@@ (mudsync room) <exit>)
          #:name name
          #:to-symbol to-symbol
          #:desc desc))))
@@ -101,7 +100,7 @@
         (let ((room
                (apply create-actor* gm room-class "room"
                       #:gm (actor-id gm)
-                      #:exits (map exit-from-spec room-exits)
+                      #:exits (map exit-from-spec (pk 'dem-exits room-exits))
                       room-args)))
           ;; register the room
           (hash-set! (gm-room-dir gm) room-symbol room)
@@ -147,12 +146,7 @@
   (format #t "DEBUG: From ~s: ~s\n" client-id input)
 
   (<- actor player 'handle-input
-      #:input input)
-
-  ;; TODO: Remove this shortly
-  (<- actor (gm-network-manager actor) 'send-to-client
-      #:client client-id
-      #:data "Thanks, we got it!\n"))
+      #:input input))
 
 (define-mhandler (gm-lookup-room actor message symbol)
   (define room-id