X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fplayer.scm;h=3d1ec7288baf6c83387046b4612436546e1105c3;hp=00b28edde4cbeab67239e2266dd462d06469c9d6;hb=e6f8f000860185b49867e9c5610324b30c98abbb;hpb=d539213774955a5593ec760f06022aeecf4e1abc

diff --git a/mudsync/player.scm b/mudsync/player.scm
index 00b28ed..3d1ec72 100644
--- a/mudsync/player.scm
+++ b/mudsync/player.scm
@@ -50,13 +50,11 @@
 
 (define-class <player> (<gameobj>)
   (username #:init-keyword #:username
-            #:accessor player-username)
-  ;; Connection id
-  (client #:accessor player-client)
+            #:getter player-username)
 
   (self-commands
    #:init-value '()
-   #:accessor player-self-commands)
+   #:getter player-self-commands)
 
   (message-handler
    #:init-value
@@ -73,19 +71,18 @@
 
 (define-mhandler (player-handle-input player message input)
   (define split-input (split-verb-and-rest input))
-  (define input-verb (pk 'input-verb (car split-input)))
-  (define input-rest (pk 'input-rest (cdr split-input)))
+  (define input-verb (car split-input))
+  (define input-rest (cdr split-input))
 
   (define command-candidates
-    (pk 'candidates
-        (player-gather-command-handlers player input-verb)))
+    (player-gather-command-handlers player input-verb))
 
   (define winner
-    (pk 'winner (find-command-winner command-candidates input-rest)))
+    (find-command-winner command-candidates input-rest))
 
   (match winner
     ((cmd-action winner-id message-args)
-     (apply send-message player (pk 'winner-id winner-id) (pk 'cmd-action cmd-action) (pk 'message-args message-args)))
+     (apply send-message player winner-id cmd-action message-args))
     (#f
      (<- player (gameobj-gm player) 'write-home
          #:text "Huh?\n"))))
@@ -137,12 +134,10 @@
     ;;   returns false for in the command response
     (fold
      (lambda (co-occupant prev)
-       (display "pre-message\n")
        (let* ((result (<-wait player co-occupant 'get-commands
                               #:verb verb))
               (commands (message-ref result 'commands))
               (goes-by (message-ref result 'goes-by)))
-         (display "post-message\n")
          (append
           (map (lambda (command)
                  (list command goes-by co-occupant))
@@ -159,7 +154,7 @@
 
   ;; Now return a big ol sorted list of ((actor-id . command))
   (append
-   (sort-commands-append-actor (pk 'room-commands room-commands)
+   (sort-commands-append-actor room-commands
                                player-loc '()) ; room doesn't go by anything
    (sort-commands-multi-actors co-occupant-commands)
    (sort-commands-append-actor our-commands
@@ -173,8 +168,6 @@
   (sort
    actors-and-commands
    (lambda (x y)
-     (pk 'x x)
-     (pk 'y y)
      (> (command-priority (car x))
         (command-priority (car y))))))
 
@@ -198,7 +191,7 @@
                            actor-goes-by
                            matched))  ; matched is kwargs if truthy
                (return (list (command-action command)
-                             (pk 'earlier-actor-id actor-id) matched))
+                             actor-id matched))
                #f))))
       sorted-candidates)
      #f)))