X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=inline;f=mudsync%2Fgame-master.scm;h=595a9032ee391b9dc1b29dc6e4b361750490ca92;hb=8c357c87019a70aabdfadb4c71e3b063251cff87;hp=f839931002fe663cabe8c62c2458be623407a4f7;hpb=c3e788ae7726f7e52a62ffeb30254bfa0f0da7cb;p=mudsync.git
diff --git a/mudsync/game-master.scm b/mudsync/game-master.scm
index f839931..595a903 100644
--- a/mudsync/game-master.scm
+++ b/mudsync/game-master.scm
@@ -17,7 +17,6 @@
;;; along with Mudsync. If not, see .
(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
+ (make (@@ (mudsync room) )
#: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
@@ -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)))))