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:
e6bd5ce
)
Rename msg-foo to mbody-foo
author
Christopher Allan Webber
<cwebber@dustycloud.org>
Wed, 4 Jan 2017 16:39:04 +0000
(10:39 -0600)
committer
Christopher Allan Webber
<cwebber@dustycloud.org>
Wed, 4 Jan 2017 16:39:04 +0000
(10:39 -0600)
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/gameobj.scm
b/mudsync/gameobj.scm
index 8efe565d9b6e84752740df5f5a28a475044ae0a1..44602dfb5463d5dfe5c4e0cd4d655b88c8e8b0c9 100644
(file)
--- a/
mudsync/gameobj.scm
+++ b/
mudsync/gameobj.scm
@@
-140,7
+140,7
@@
(define (run-replacement actor replaces replace-steps)
(when replaces
(define (run-replacement actor replaces replace-steps)
(when replaces
- (m
sg
-receive (_ #:key occupants)
+ (m
body
-receive (_ #:key occupants)
(<-wait replaces 'assist-replace)
(for-each
(lambda (replace-step)
(<-wait replaces 'assist-replace)
(for-each
(lambda (replace-step)
@@
-348,8
+348,8
@@
By default, this is whether or not the generally-visible flag is set."
(match special-symbol
;; if it's a symbol, look it up dynamically
((? symbol? _)
(match special-symbol
;; if it's a symbol, look it up dynamically
((? symbol? _)
- (m
sg
-val (<-wait (slot-ref gameobj 'gm) 'lookup-special
- #:symbol special-symbol)))
+ (m
body
-val (<-wait (slot-ref gameobj 'gm) 'lookup-special
+
#:symbol special-symbol)))
;; if it's false, return nothing
(#f #f)
;; otherwise it's probably an address, return it as-is
;; if it's false, return nothing
(#f #f)
;; otherwise it's probably an address, return it as-is
diff --git
a/mudsync/player.scm
b/mudsync/player.scm
index 1063955b6d4ba56371d82b5952ca84943d7d3991..a0caf239940198eb80808925ae652b00d295caa2 100644
(file)
--- a/
mudsync/player.scm
+++ b/
mudsync/player.scm
@@
-103,7
+103,7
@@
(define inv-names
(map
(lambda (inv-item)
(define inv-names
(map
(lambda (inv-item)
- (m
sg
-val (<-wait inv-item 'get-name)))
+ (m
body
-val (<-wait inv-item 'get-name)))
(gameobj-occupants player)))
(define text-to-show
(if (eq? inv-names '())
(gameobj-occupants player)))
(define text-to-show
(if (eq? inv-names '())
@@
-133,7
+133,7
@@
;; Ask the room for its commands
(define room-commands
;; TODO: Map room id and sort
;; Ask the room for its commands
(define room-commands
;; TODO: Map room id and sort
- (m
sg
-receive (_ #:key commands)
+ (m
body
-receive (_ #:key commands)
(<-wait player-loc 'get-container-commands
#:verb verb)
commands))
(<-wait player-loc 'get-container-commands
#:verb verb)
commands))
@@
-142,7
+142,7
@@
(define co-occupants
(remove
(lambda (x) (equal? x (actor-id player)))
(define co-occupants
(remove
(lambda (x) (equal? x (actor-id player)))
- (m
sg
-receive (_ #:key occupants)
+ (m
body
-receive (_ #:key occupants)
(<-wait player-loc 'get-occupants)
occupants)))
(<-wait player-loc 'get-occupants)
occupants)))
@@
-155,7
+155,7
@@
(define co-occupant-commands
(fold
(lambda (co-occupant prev)
(define co-occupant-commands
(fold
(lambda (co-occupant prev)
- (m
sg
-receive (_ #:key commands goes-by)
+ (m
body
-receive (_ #:key commands goes-by)
(<-wait co-occupant 'get-commands
#:verb verb)
(append
(<-wait co-occupant 'get-commands
#:verb verb)
(append
@@
-180,7
+180,7
@@
(define inv-item-commands
(fold
(lambda (inv-item prev)
(define inv-item-commands
(fold
(lambda (inv-item prev)
- (m
sg
-receive (_ #:key commands goes-by)
+ (m
body
-receive (_ #:key commands goes-by)
(<-wait inv-item 'get-contained-commands
#:verb verb)
(append
(<-wait inv-item 'get-contained-commands
#:verb verb)
(append
diff --git
a/mudsync/room.scm
b/mudsync/room.scm
index 0ad886ceece07226a1dd508154c91c619535e4a1..aaedd5ce6a15ff5297f3157aa7f52712b82cae65 100644
(file)
--- a/
mudsync/room.scm
+++ b/
mudsync/room.scm
@@
-105,7
+105,7
@@
(dyn-ref room (slot-ref exit 'to))
#f))
(define player-name
(dyn-ref room (slot-ref exit 'to))
#f))
(define player-name
- (m
sg
-val (<-wait (message-from message) 'get-name)))
+ (m
body
-val (<-wait (message-from message) 'get-name)))
(cond
(exit
;; Set the player's new location
(cond
(exit
;; Set the player's new location
@@
-202,7
+202,7
@@
(lambda (return)
(for-each
(lambda (occupant)
(lambda (return)
(for-each
(lambda (occupant)
- (m
sg
-receive (_ #:key goes-by)
+ (m
body
-receive (_ #:key goes-by)
(<-wait occupant 'goes-by)
(if (member called-this goes-by)
(return occupant))))
(<-wait occupant 'goes-by)
(if (member called-this goes-by)
(return occupant))))
@@
-221,7
+221,7
@@
(cond
(matching-object
(let ((obj-desc
(cond
(matching-object
(let ((obj-desc
- (m
sg
-val (<-wait matching-object 'get-desc
+ (m
body
-val (<-wait matching-object 'get-desc
#:whos-looking (message-from message)))))
(if obj-desc
(<- (message-from message) 'tell
#:whos-looking (message-from message)))))
(if obj-desc
(<- (message-from message) 'tell
@@
-255,7
+255,7
@@
(define* (room-cmd-say room message #:key phrase)
"Command: Say something to room participants."
(define player-name
(define* (room-cmd-say room message #:key phrase)
"Command: Say something to room participants."
(define player-name
- (m
sg
-val (<-wait (message-from message) 'get-name)))
+ (m
body
-val (<-wait (message-from message) 'get-name)))
(define message-to-send
(format #f "~a says: ~a\n" player-name phrase))
(room-tell-room room message-to-send))
(define message-to-send
(format #f "~a says: ~a\n" player-name phrase))
(room-tell-room room message-to-send))
@@
-263,14
+263,14
@@
(define* (room-cmd-emote room message #:key phrase)
"Command: Say something to room participants."
(define player-name
(define* (room-cmd-emote room message #:key phrase)
"Command: Say something to room participants."
(define player-name
- (m
sg
-val (<-wait (message-from message) 'get-name)))
+ (m
body
-val (<-wait (message-from message) 'get-name)))
(define message-to-send
(format #f "* ~a ~a\n" player-name phrase))
(room-tell-room room message-to-send))
(define* (room-announce-entrance room message #:key who-entered)
(define player-name
(define message-to-send
(format #f "* ~a ~a\n" player-name phrase))
(room-tell-room room message-to-send))
(define* (room-announce-entrance room message #:key who-entered)
(define player-name
- (m
sg
-val (<-wait who-entered 'get-name)))
+ (m
body
-val (<-wait who-entered 'get-name)))
(define message-to-send
(format #f "~a enters the room.\n" player-name))
(room-tell-room room message-to-send
(define message-to-send
(format #f "~a enters the room.\n" player-name))
(room-tell-room room message-to-send
diff --git
a/mudsync/thing.scm
b/mudsync/thing.scm
index f2e218016ec23e6b09617b4428a18cceaf6a1dcc..6399c6f71e174dbd0599e25fe0d6577a55cbd18d 100644
(file)
--- a/
mudsync/thing.scm
+++ b/
mudsync/thing.scm
@@
-70,9
+70,9
@@
(define* (thing-cmd-take thing message #:key direct-obj)
(define player (message-from message))
(define player-name
(define* (thing-cmd-take thing message #:key direct-obj)
(define player (message-from message))
(define player-name
- (m
sg
-val (<-wait player 'get-name)))
+ (m
body
-val (<-wait player 'get-name)))
(define player-loc
(define player-loc
- (m
sg
-val (<-wait player 'get-loc)))
+ (m
body
-val (<-wait player 'get-loc)))
(define thing-name (slot-ref thing 'name))
(define should-take
(slot-ref-maybe-runcheck thing 'takeable player))
(define thing-name (slot-ref thing 'name))
(define should-take
(slot-ref-maybe-runcheck thing 'takeable player))
@@
-95,9
+95,9
@@
(define* (thing-cmd-drop thing message #:key direct-obj)
(define player (message-from message))
(define player-name
(define* (thing-cmd-drop thing message #:key direct-obj)
(define player (message-from message))
(define player-name
- (m
sg
-val (<-wait player 'get-name)))
+ (m
body
-val (<-wait player 'get-name)))
(define player-loc
(define player-loc
- (m
sg
-val (<-wait player 'get-loc)))
+ (m
body
-val (<-wait player 'get-loc)))
(define thing-name (slot-ref thing 'name))
(define should-drop
(slot-ref-maybe-runcheck thing 'dropable player))
(define thing-name (slot-ref thing 'name))
(define should-drop
(slot-ref-maybe-runcheck thing 'dropable player))
diff --git
a/worlds/bricabrac.scm
b/worlds/bricabrac.scm
index 7570b0d02840fb24ee3788652b54bc76d5a16cc8..ba0b75fe008bb90e208299ff3aafd23a02414575 100644
(file)
--- a/
worlds/bricabrac.scm
+++ b/
worlds/bricabrac.scm
@@
-146,7
+146,7
@@
or 'skribe'? Now *that's* composition!"))
(define* (sign-cmd-sign-in actor message
#:key direct-obj indir-obj preposition)
(define old-name
(define* (sign-cmd-sign-in actor message
#:key direct-obj indir-obj preposition)
(define old-name
- (m
sg
-val (<-wait (message-from message) 'get-name)))
+ (m
body
-val (<-wait (message-from message) 'get-name)))
(define name indir-obj)
(if (valid-name? indir-obj)
(begin
(define name indir-obj)
(if (valid-name? indir-obj)
(begin
@@
-182,7
+182,7
@@
character.\n")))
;; handler... meanwhile, this procedure suspends until we get
;; their response.
(define who-rang
;; handler... meanwhile, this procedure suspends until we get
;; their response.
(define who-rang
- (m
sg
-val (<-wait (message-from message) 'get-name)))
+ (m
body
-val (<-wait (message-from message) 'get-name)))
;; Now we'll invoke the "tell" message handler on the player
;; who rang us, displaying this text on their screen.
;; Now we'll invoke the "tell" message handler on the player
;; who rang us, displaying this text on their screen.
@@
-390,7
+390,7
@@
if this room is intended for children or child-like adults."
(define* (furniture-cmd-sit actor message #:key direct-obj)
(define player-name
(define* (furniture-cmd-sit actor message #:key direct-obj)
(define player-name
- (m
sg
-val (<-wait (message-from message) 'get-name)))
+ (m
body
-val (<-wait (message-from message) 'get-name)))
(<- (message-from message) 'tell
#:text (format #f "You ~a ~a.\n"
(slot-ref actor 'sit-phrase)
(<- (message-from message) 'tell
#:text (format #f "You ~a ~a.\n"
(slot-ref actor 'sit-phrase)
@@
-601,7
+601,7
@@
You can ask me about the following:
(define* (clerk-cmd-dismiss clerk message . _)
(define player-name
(define* (clerk-cmd-dismiss clerk message . _)
(define player-name
- (m
sg
-val (<-wait (message-from message) 'get-name)))
+ (m
body
-val (<-wait (message-from message) 'get-name)))
(match (slot-ref clerk 'state)
('on-duty
(<- (gameobj-loc clerk) 'tell-room
(match (slot-ref clerk 'state)
('on-duty
(<- (gameobj-loc clerk) 'tell-room