commands finally dispatch

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

diff --git a/mudsync/game-master.scm b/mudsync/game-master.scm
index f839931002fe663cabe8c62c2458be623407a4f7..3583f95662cc68a25abb72f8ddeaa4d82f689d9b 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))))
@@ -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
@@ -206,7 +200,7 @@ with an anonymous persona"
         ;; Register the player in our database of players -> connections
         (gm-register-client! gm client-id player)
         ;; Dump the player into the default room
-        (<-wait gm player 'set-loc! #:id room-id)
+        (<-wait gm player 'set-loc! #:loc room-id)
         ;; Initialize the player
         (<- gm player 'init)))))