diff options
author | Stijn Buys <ingar@osirion.org> | 2011-02-10 18:07:24 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2011-02-10 18:07:24 +0000 |
commit | 9ff5cf6184b9c5183c1f55cfa6c0d08586eb02c9 (patch) | |
tree | d50dd2d8ed48acfbb7063d4c073f77cb195106f7 /src/core/application.cc | |
parent | a255dbc032d15a4f5024bc60baa19c45ebceecc6 (diff) |
Added a local chat channel. The say command defaults to zone chat, global messages can be send with the shout command.
Removed NonSolid flag fro race objects, have race use the local chat channel.
Updated to network protocol version 22.
Updated developer documentation.
Diffstat (limited to 'src/core/application.cc')
-rw-r--r-- | src/core/application.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/core/application.cc b/src/core/application.cc index c731833..ec7e89c 100644 --- a/src/core/application.cc +++ b/src/core/application.cc @@ -202,8 +202,11 @@ void Application::init(int count, char **arguments) func = Func::add("disconnect", Application::func_disconnect); func->set_info("leave the current game"); + func = Func::add("shout", Application::func_shout); + func->set_info("shout [text] shout something on the global chat"); + func = Func::add("say", Application::func_say); - func->set_info("say [text] say something on the public chat"); + func->set_info("say [text] say something on the local chat"); func = Func::add("msg", Application::func_msg); func->set_info("msg [player] [text] send a private message to another player"); @@ -518,6 +521,17 @@ void Application::func_disconnect(std::string const &args) Application::instance()->disconnect(); } +void Application::func_shout(std::string const &args) +{ + if (connection()) { + connection()->shout(args); + } else if (server()) { + server()->shout(localplayer(), args); + } else { + con_print << "Not connected." << std::endl; + } +} + void Application::func_say(std::string const &args) { if (connection()) { |