#:use-module (8sync agenda)
#:use-module (oop goops)
#:use-module (ice-9 match)
+ #:use-module (srfi srfi-26)
#:export (<game-master>
make-default-room-conn-handler))
#:getter gm-reverse-client-dir)
;; Network manager
- (network-manager #:accessor gm-network-manager
+ (network-manager #:getter gm-network-manager
#:init-value #f)
;; How we get a new connection acclimated to the system
- (new-conn-handler #:accessor gm-new-conn-handler
+ (new-conn-handler #:getter gm-new-conn-handler
#:init-keyword #:new-conn-handler)
(message-handler
(client-input (wrap-apply gm-handle-client-input))
(lookup-special (wrap-apply gm-lookup-special))
(new-client (wrap-apply gm-new-client))
- (write-home (wrap-apply gm-write-home)))))
+ (write-home (wrap-apply gm-write-home))
+ (client-closed (wrap-apply gm-client-closed))
+ (inject-special! (wrap-apply gm-inject-special!)))))
;;; .. begin world init stuff ..
;; Set up the network
(gm-setup-network gm))
+
+;; @@: If you change this code, update gm-inject-special! if appropriate.
(define (gm-init-game-spec gm game-spec)
"Initialize the prebuilt special objects"
(define set-locs '())
(define (gm-setup-network gm)
;; Create a default network manager if none available
- (set! (gm-network-manager gm)
- (create-actor* gm <network-manager> "netman"
+ (slot-set! gm 'network-manager
+ (create-actor* gm <network-manager> "netman"
#:send-input-to (actor-id gm)))
;; TODO: Add host and port options
(define-mhandler (gm-lookup-special actor message symbol)
(<-reply actor message
- #:room-id (hash-ref (slot-ref actor 'special-dir) symbol)))
+ #:val (hash-ref (slot-ref actor 'special-dir) symbol)))
(define-mhandler (gm-write-home actor message text)
(define client-id (hash-ref (gm-reverse-client-dir actor)
#:client client-id
#:data text))
+(define-mhandler (gm-client-closed gm message client)
+ ;; Do we have this client registered to an actor? Get the id if so.
+ (define actor-id (hash-ref (gm-client-dir gm) client))
+
+ ;; Have the actor appropriately disappear / be removed from its
+ ;; room, if we have one.
+ ;; (In some games, if the user never connected)
+ (when actor-id
+ (<-wait gm actor-id 'disconnect-self-destruct)
+ ;; Unregister from the client directories.
+ (gm-unregister-client! gm client)))
+
+
+(define-mhandler (gm-inject-special! gm message
+ special-symbol gameobj-spec)
+ "Inject, possiibly replacing the original, special symbol
+using the gameobj-spec."
+ (define existing-obj
+ (hash-ref (slot-ref gm 'special-dir) special-symbol))
+
+ ;; There's a lot of overlap here with gm-init-game-spec.
+ ;; We could try to union them? It seemed hard last time I looked,
+ ;; because things need to run in a different order.
+ (match gameobj-spec
+ (((? (cut eq? <> special-symbol) symbol) class loc args ...)
+ ;; initialize the special object
+ (let ((special-obj
+ (apply create-actor* gm class
+ ;; set cookie to be the object's symbol
+ (symbol->string symbol)
+ #:gm (actor-id gm)
+ args)))
+ ;; Set the location
+ (<-wait gm special-obj 'set-loc!
+ #:loc (hash-ref (gm-special-dir gm) loc))
+ ;; Initialize the object, and depending on if an object
+ ;; already exists with this info, ask it to coordinate
+ ;; replacing with the existing object.
+ (if existing-obj
+ (<-wait gm special-obj 'init #:replace existing-obj)
+ (<-wait gm special-obj 'init))
+ ;; Register the object
+ (hash-set! (gm-special-dir gm) symbol special-obj)
+ ;; Destroy the original, if it exists.
+ (if existing-obj
+ (<- gm existing-obj 'self-destruct #:why 'replaced))))))
;;; GM utilities
(hash-set! (gm-client-dir gm) client-id player)
(hash-set! (gm-reverse-client-dir gm) player client-id))
-(define (gm-unregister-client! gm client-id)
+(define* (gm-unregister-client! gm client-id #:optional destroy-player)
"Remove a connection/player combo and ask them to self destruct"
(match (hash-remove! (gm-client-dir gm) client-id) ; Remove from our client dir
((_ . player-id)
;; Remove from reverse table too
(hash-remove! (gm-reverse-client-dir gm) client-id)
;; Destroy player
- (<- gm player-id 'destroy-self))
+ (if destroy-player
+ (<- gm player-id 'self-destruct)))
(#f (throw 'no-client-to-unregister
"Can't unregister a client that doesn't exist?"
client-id))))
(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))
;; create and register the player
(player
(create-actor* gm (@@ (mudsync player) <player>) "player"
- #:username guest-name
+ #:name 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
(<-wait gm player 'set-loc! #:loc room-id)
;; Initialize the player
- (<- gm player 'init)))))
-
+ (<-wait gm player 'init)
+ (<- gm room-id 'tell-room
+ #:text (format #f "You see ~a materialize out of thin air!\n"
+ guest-name)
+ #:exclude player)))))
projects / mudsync.git / blobdiff