projects
/
mudsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Port to the remove-define-mhandler 8sync branch
[mudsync.git]
/
mudsync
/
game-master.scm
diff --git
a/mudsync/game-master.scm
b/mudsync/game-master.scm
index 8bc239bdb9bebedf6eebbe047879f8e495b218ab..0a53389aef6865e24ae7ee5624e281022e03bed5 100644
(file)
--- a/
mudsync/game-master.scm
+++ b/
mudsync/game-master.scm
@@
-63,12
+63,12
@@
;;; .. begin world init stuff ..
;;; .. begin world init stuff ..
-(define
(gm-init-world gm message
)
+(define
* (gm-init-world gm message #:key game-spec
)
;; Load database
;; TODO
;; Init basic rooms / structure
;; Load database
;; TODO
;; Init basic rooms / structure
- (gm-init-game-spec gm
(message-ref message 'game-spec)
)
+ (gm-init-game-spec gm
game-spec
)
;; Restore database-based actors
;; TODO
;; Restore database-based actors
;; TODO
@@
-131,36
+131,35
@@
;;; .. end world init stuff ...
;;; .. end world init stuff ...
-(define
-mhandler (gm-new-client actor message
client)
+(define
* (gm-new-client actor message #:key
client)
;; @@: Maybe more indirection than needed for this
((gm-new-conn-handler actor) actor client))
;; @@: Maybe more indirection than needed for this
((gm-new-conn-handler actor) actor client))
-(define (gm-handle-client-input actor message)
+(define* (gm-handle-client-input actor message
+ #:key client data)
"Handle input from a client."
"Handle input from a client."
- (define client-id (message-ref message 'client))
- (define input (message-ref message 'data))
;; Look up player
;; Look up player
- (define player (hash-ref (gm-client-dir actor) client
-id
))
+ (define player (hash-ref (gm-client-dir actor) client))
;; debugging
;; debugging
- (format #t "DEBUG: From ~s: ~s\n" client
-id input
)
+ (format #t "DEBUG: From ~s: ~s\n" client
data
)
(<- actor player 'handle-input
(<- actor player 'handle-input
- #:input
input
))
+ #:input
data
))
-(define
-mhandler (gm-lookup-special actor message
symbol)
+(define
* (gm-lookup-special actor message #:key
symbol)
(<-reply actor message
#:val (hash-ref (slot-ref actor 'special-dir) symbol)))
(<-reply actor message
#:val (hash-ref (slot-ref actor 'special-dir) symbol)))
-(define
-mhandler (gm-write-home actor message
text)
+(define
* (gm-write-home actor message #:key
text)
(define client-id (hash-ref (gm-reverse-client-dir actor)
(message-from message)))
(<- actor (gm-network-manager actor) 'send-to-client
#:client client-id
#:data text))
(define client-id (hash-ref (gm-reverse-client-dir actor)
(message-from message)))
(<- actor (gm-network-manager actor) 'send-to-client
#:client client-id
#:data text))
-(define
-mhandler (gm-client-closed gm message
client)
+(define
* (gm-client-closed gm message #:key
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))
;; Do we have this client registered to an actor? Get the id if so.
(define actor-id (hash-ref (gm-client-dir gm) client))
@@
-173,8
+172,8
@@
(gm-unregister-client! gm client)))
(gm-unregister-client! gm client)))
-(define
-mhandler
(gm-inject-special! gm message
-
special-symbol gameobj-spec)
+(define
*
(gm-inject-special! gm message
+
#:key
special-symbol gameobj-spec)
"Inject, possiibly replacing the original, special symbol
using the gameobj-spec."
(define existing-obj
"Inject, possiibly replacing the original, special symbol
using the gameobj-spec."
(define existing-obj