projects
/
mudsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bbf4557
)
Update to use #:init-thunk instead of #:init-value on actions slot
author
Christopher Allan Webber
<cwebber@dustycloud.org>
Wed, 25 Jan 2017 17:46:20 +0000
(11:46 -0600)
committer
Christopher Allan Webber
<cwebber@dustycloud.org>
Wed, 25 Jan 2017 17:46:20 +0000
(11:46 -0600)
mudsync/game-master.scm
patch
|
blob
|
history
mudsync/gameobj.scm
patch
|
blob
|
history
mudsync/player.scm
patch
|
blob
|
history
mudsync/room.scm
patch
|
blob
|
history
mudsync/thing.scm
patch
|
blob
|
history
worlds/bricabrac.scm
patch
|
blob
|
history
diff --git
a/mudsync/game-master.scm
b/mudsync/game-master.scm
index 4576de31146cf54c33d9f64c56e195f27389ad16..7b93a3bf25d40ece239fe4bd6de35b3313779fbc 100644
(file)
--- a/
mudsync/game-master.scm
+++ b/
mudsync/game-master.scm
@@
-51,7
+51,7
@@
(actions
#:allocation #:each-subclass
(actions
#:allocation #:each-subclass
- #:init-
value
+ #:init-
thunk
(build-actions
(init-world gm-init-world)
(client-input gm-handle-client-input)
(build-actions
(init-world gm-init-world)
(client-input gm-handle-client-input)
diff --git
a/mudsync/gameobj.scm
b/mudsync/gameobj.scm
index 11de8d3cce86604c7ba3ca4dacf7394745a23bba..e4146931bc7f7b2b830b7369ac58bae162f953be 100644
(file)
--- a/
mudsync/gameobj.scm
+++ b/
mudsync/gameobj.scm
@@
-93,7
+93,7
@@
(actions #:allocation #:each-subclass
;;; Actions supported by all gameobj
(actions #:allocation #:each-subclass
;;; Actions supported by all gameobj
- #:init-
value
+ #:init-
thunk
(build-actions
(init gameobj-act-init)
;; Commands for co-occupants
(build-actions
(init gameobj-act-init)
;; Commands for co-occupants
diff --git
a/mudsync/player.scm
b/mudsync/player.scm
index a450038d53ac64d0206b25bb8e993400a3f16a75..bfa7ca88b0e8911810a43246cbe59ad905ba0845 100644
(file)
--- a/
mudsync/player.scm
+++ b/
mudsync/player.scm
@@
-51,7
+51,7
@@
(self-commands #:init-value (wrap player-self-commands))
(actions #:allocation #:each-subclass
(self-commands #:init-value (wrap player-self-commands))
(actions #:allocation #:each-subclass
- #:init-
value
+ #:init-
thunk
(build-actions
(init player-init)
(handle-input player-handle-input)
(build-actions
(init player-init)
(handle-input player-handle-input)
diff --git
a/mudsync/room.scm
b/mudsync/room.scm
index c1e853689d81422e46fa07c5870bfdc7b9dacf70..4c02e7fe3c8d3ed18601434cb0314f7d1a442763 100644
(file)
--- a/
mudsync/room.scm
+++ b/
mudsync/room.scm
@@
-82,7
+82,7
@@
#:init-value (wrap %room-contain-commands))
(actions #:allocation #:each-subclass
#:init-value (wrap %room-contain-commands))
(actions #:allocation #:each-subclass
- #:init-
value
+ #:init-
thunk
(build-actions
(cmd-go room-cmd-go)
(cmd-go-where room-cmd-go-where)
(build-actions
(cmd-go room-cmd-go)
(cmd-go-where room-cmd-go-where)
diff --git
a/mudsync/thing.scm
b/mudsync/thing.scm
index 6399c6f71e174dbd0599e25fe0d6577a55cbd18d..64ceeee5a094550584d9844ebf97957ee0cf6986 100644
(file)
--- a/
mudsync/thing.scm
+++ b/
mudsync/thing.scm
@@
-62,7
+62,7
@@
(contained-commands
#:init-value (wrap thing-contained-commands))
(actions #:allocation #:each-subclass
(contained-commands
#:init-value (wrap thing-contained-commands))
(actions #:allocation #:each-subclass
- #:init-
value
+ #:init-
thunk
(build-actions
(cmd-take thing-cmd-take)
(cmd-drop thing-cmd-drop))))
(build-actions
(cmd-take thing-cmd-take)
(cmd-drop thing-cmd-drop))))
diff --git
a/worlds/bricabrac.scm
b/worlds/bricabrac.scm
index 18fd6f28303b91f7769207d0a549faf24a009bcb..3b3f4c1c7101dfc7bc548ecd68edc972cc80fbd2 100644
(file)
--- a/
worlds/bricabrac.scm
+++ b/
worlds/bricabrac.scm
@@
-60,7
+60,7
@@
(commands
#:init-value readable-commands*)
(actions #:allocation #:each-subclass
(commands
#:init-value readable-commands*)
(actions #:allocation #:each-subclass
- #:init-
value
(build-actions
+ #:init-
thunk
(build-actions
(cmd-read readable-cmd-read))))
(define (readable-cmd-read actor message)
(cmd-read readable-cmd-read))))
(define (readable-cmd-read actor message)
@@
-107,7
+107,7
@@
or 'skribe'? Now *that's* composition!"))
(commands
#:init-value chat-commands)
(actions #:allocation #:each-subclass
(commands
#:init-value chat-commands)
(actions #:allocation #:each-subclass
- #:init-
value
+ #:init-
thunk
(build-actions
(cmd-chat npc-chat-randomly))))
(build-actions
(cmd-chat npc-chat-randomly))))
@@
-118,7
+118,7
@@
or 'skribe'? Now *that's* composition!"))
(prep-direct-command "sign" 'cmd-sign-form
'("as"))))
(actions #:allocation #:each-subclass
(prep-direct-command "sign" 'cmd-sign-form
'("as"))))
(actions #:allocation #:each-subclass
- #:init-
value
(build-actions
+ #:init-
thunk
(build-actions
(cmd-sign-form sign-cmd-sign-in))))
(cmd-sign-form sign-cmd-sign-in))))
@@
-163,7
+163,7
@@
character.\n")))
(commands
#:init-value summoning-bell-commands*)
(actions #:allocation #:each-subclass
(commands
#:init-value summoning-bell-commands*)
(actions #:allocation #:each-subclass
- #:init-
value
(build-actions
+ #:init-
thunk
(build-actions
(cmd-ring summoning-bell-cmd-ring))))
(define* (summoning-bell-cmd-ring bell message . _)
(cmd-ring summoning-bell-cmd-ring))))
(define* (summoning-bell-cmd-ring bell message . _)
@@
-471,7
+471,7
@@
if this room is intended for children or child-like adults."
(list
(direct-command "sit" 'cmd-sit-furniture)))
(actions #:allocation #:each-subclass
(list
(direct-command "sit" 'cmd-sit-furniture)))
(actions #:allocation #:each-subclass
- #:init-
value
(build-actions
+ #:init-
thunk
(build-actions
(cmd-sit-furniture furniture-cmd-sit))))
(define* (furniture-cmd-sit actor message #:key direct-obj)
(cmd-sit-furniture furniture-cmd-sit))))
(define* (furniture-cmd-sit actor message #:key direct-obj)
@@
-577,7
+577,7
@@
It has some bits of bubble gum stuck to it... yuck."
(commands #:init-value clerk-commands*)
(patience #:init-value 0)
(actions #:allocation #:each-subclass
(commands #:init-value clerk-commands*)
(patience #:init-value 0)
(actions #:allocation #:each-subclass
- #:init-
value
(build-actions
+ #:init-
thunk
(build-actions
(init clerk-act-init)
(cmd-chat clerk-cmd-chat)
(cmd-ask-incomplete clerk-cmd-ask-incomplete)
(init clerk-act-init)
(cmd-chat clerk-cmd-chat)
(cmd-ask-incomplete clerk-cmd-ask-incomplete)