X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fgame-master.scm;h=9ced9fadfdf5b4ee90259e145e9b19f75c843acb;hp=0d2051ec48bd43df10abfd3e56e1e38203f3c845;hb=43b6ac4e8ceff7aad909294b1b00ebdd6a38ec15;hpb=7525c62ccdf9e3480214831fb14d9a2d30ab139d

diff --git a/mudsync/game-master.scm b/mudsync/game-master.scm
index 0d2051e..9ced9fa 100644
--- a/mudsync/game-master.scm
+++ b/mudsync/game-master.scm
@@ -41,11 +41,11 @@
                       #: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
@@ -55,7 +55,8 @@
     (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)))))
 
 
 ;;; .. begin world init stuff ..
@@ -114,8 +115,8 @@
 
 (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
@@ -155,6 +156,18 @@
       #: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)))
+
 
 ;;; GM utilities
 
@@ -162,14 +175,15 @@
   (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))))
@@ -179,7 +193,6 @@
 (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))
@@ -190,14 +203,17 @@ with an anonymous persona"
              ;; 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)))))