From: Christopher Allan Webber Date: Thu, 5 May 2016 19:38:09 +0000 (-0500) Subject: remove (pk 'foo) X-Git-Tag: fosdem-2017~177 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=af6f936a671c835bc6d9aadc59fd8ff5969fe1ad;p=mudsync.git remove (pk 'foo) --- diff --git a/mudsync/player.scm b/mudsync/player.scm index 3fb0136..09fc6d7 100644 --- a/mudsync/player.scm +++ b/mudsync/player.scm @@ -71,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")))) @@ -157,7 +156,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 @@ -171,8 +170,6 @@ (sort actors-and-commands (lambda (x y) - (pk 'x x) - (pk 'y y) (> (command-priority (car x)) (command-priority (car y)))))) @@ -196,7 +193,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)))