Changed option entry to msg output kwarg.

Griatch - "That way it can still be parsed by the protocol if so needed, but it is also be passed on so the client can do custom stuff with it if it can."
This commit is contained in:
CloudKeeper1 2017-03-26 13:58:10 +11:00 committed by Griatch
parent 375cd7cecb
commit 344a724479

View file

@ -417,8 +417,8 @@ class CmdSay(COMMAND_DEFAULT_CLASS):
# Build the string to emit to neighbors.
emit_string = '%s says, "%s|n"' % (caller.name, speech)
caller.location.msg_contents(emit_string, exclude=caller,
from_obj=caller, options={"type": "say"})
caller.location.msg_contents(text=(emit_string, {"type": "say"}),
exclude=caller, from_obj=caller)
class CmdWhisper(COMMAND_DEFAULT_CLASS):
@ -460,7 +460,7 @@ class CmdWhisper(COMMAND_DEFAULT_CLASS):
# Build the string to emit to receiver.
emit_string = '%s whispers, "%s|n"' % (caller.name, speech)
receiver.msg(emit_string, from_obj=caller, options={"type": "whisper"})
receiver.msg(text=(emit_string, {"type": "Whisper"}), from_obj=caller)
class CmdPose(COMMAND_DEFAULT_CLASS):
@ -503,8 +503,8 @@ class CmdPose(COMMAND_DEFAULT_CLASS):
self.caller.msg(msg)
else:
msg = "%s%s" % (self.caller.name, self.args)
self.caller.location.msg_contents(msg, from_obj=self.caller,
options={"type": "pose"})
self.caller.location.msg_contents(text=(msg, {"type": "pose"}),
from_obj=self.caller)
class CmdAccess(COMMAND_DEFAULT_CLASS):