X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=mudsync%2Fgame-master.scm;h=732427850fc72b5e9601a112b95afd077b53cd01;hb=4736bfc66c4067b0cf9daf8eb69b1fe733d54e00;hp=0abadb360fbad56574c2c471cc4ef00cb8cd370b;hpb=a841e7c04e355dd1d25c0c0a5a254bbd185cdc38;p=mudsync.git
diff --git a/mudsync/game-master.scm b/mudsync/game-master.scm
index 0abadb3..7324278 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)
@@ -80,28 +79,15 @@
(define (gm-init-rooms gm rooms-spec)
"Initialize the prebuilt rooms"
- ;; @@: Would it be nicer to just allow passing in
- ;; #:exits to the room spec itself?
- (define (exit-from-spec exit-spec)
- "Take room exits syntax from the spec, turn it into exits"
- (match exit-spec
- ((name to-symbol desc)
- (make
- #:name name
- #:to-symbol to-symbol
- #:desc desc))))
-
(define rooms
(map
(match-lambda
((room-symbol room-class
- room-args ...
- (room-exits ...))
+ room-args ...)
;; initialize the room
(let ((room
(apply create-actor* gm room-class "room"
#:gm (actor-id gm)
- #:exits (map exit-from-spec room-exits)
room-args)))
;; register the room
(hash-set! (gm-room-dir gm) room-symbol room)
@@ -147,17 +133,11 @@
(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
- (slot-ref (gm-room-dir actor) symbol))
- (<-reply actor message room-id))
+ (<-reply actor message
+ #:room-id (hash-ref (slot-ref actor 'room-dir) symbol)))
(define-mhandler (gm-write-home actor message text)
(define client-id (hash-ref (gm-reverse-client-dir actor)
@@ -190,6 +170,7 @@
(define (make-default-room-conn-handler default-room)
"Make a handler for a GM that dumps people in a default room
with an anonymous persona"
+ (display "right before breakage?\n")
(let ((count 0))
(lambda (gm client-id)
(set! count (+ count 1))
@@ -203,6 +184,7 @@ with an anonymous persona"
#:username guest-name
#:gm (actor-id gm)
#:client client-id)))
+ (display "Are we broke yet?\n")
;; Register the player in our database of players -> connections
(gm-register-client! gm client-id player)
;; Dump the player into the default room