X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=mudsync%2Fgame-master.scm;h=732427850fc72b5e9601a112b95afd077b53cd01;hb=4738c5ae39e26b65cdba3bec005bfe034c4ea2c2;hp=bb8756a5e2ca96563d0d594760d1051e0691b5bc;hpb=d13325f5f6eba20c808636948432dcdff4e138f6;p=mudsync.git

diff --git a/mudsync/game-master.scm b/mudsync/game-master.scm
index bb8756a..7324278 100644
--- a/mudsync/game-master.scm
+++ b/mudsync/game-master.scm
@@ -17,8 +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 player)
   #:use-module (mudsync networking)
   #:use-module (8sync systems actors)
   #:use-module (8sync agenda)
@@ -81,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 <exit>
-         #: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)
@@ -141,15 +126,18 @@
   "Handle input from a client."
   (define client-id (message-ref message 'client))
   (define input (message-ref message 'data))
-  (format #t "From ~s: ~s\n" client-id input)
-  (<- actor (gm-network-manager actor) 'send-to-client
-      #:client client-id
-      #:data "Thanks, we got it!\n"))
+  ;; Look up player
+  (define player (hash-ref (gm-client-dir actor) client-id))
+
+  ;; debugging
+  (format #t "DEBUG: From ~s: ~s\n" client-id input)
+
+  (<- actor player 'handle-input
+      #: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)
@@ -182,23 +170,25 @@
 (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)
-      (define guest-name (string-append "Guest-"
+      (set! count (+ count 1))
+      (let* ((guest-name (string-append "Guest-"
                                         (number->string count)))
-      (define room-id
-        (hash-ref (gm-room-dir gm) default-room))
-      ;; create and register the player
-      (define player
-        (create-actor* gm <player> "player"
-                       #:username guest-name
-                       #:gm (actor-id gm)
-                       #:client client-id))
-
-      ;; 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)
-      ;; Initialize the player
-      (<- gm player 'init))))
+             (room-id
+              (hash-ref (gm-room-dir gm) default-room))
+             ;; create and register the player
+             (player
+              (create-actor* gm (@@ (mudsync player) <player>) "player"
+                             #: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
+        (<-wait gm player 'set-loc! #:loc room-id)
+        ;; Initialize the player
+        (<- gm player 'init)))))