0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed /adminmsg command to /report to better reflect its use...

Browse source 
...and corrected the /whisper help entry.
This commit is contained in:
Gunter Labes 2011-03-27 11:30:50 +00:00
parent 332e5c3776
commit b50873aa62
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -21,6 +21,7 @@ Version 1.9.4+svn:
* Don't show team labels to observers (feature request #9648).
* Recalculate map labels to account for team changes when switching players
with :control.
* Renamed /adminmsg command to /report to better reflect its use.
* User interface:
* Added: circle to the gui2 canvas.
* Added: new tip class for tooltips and helptips.

1
players_changelog
View file

@ -22,6 +22,7 @@ Version 1.9.4+svn:
* Multiplayer:
* Don't show team labels to observers.
* Renamed /adminmsg command to /report to better reflect its use.
* User interface:
* Add 1.25, 1.75 and 3.0 animation speed factors to display preferences.

14
src/menu_events.cpp
View file

@ -2316,15 +2316,17 @@ class chat_command_handler : public map_command_handler<chat_command_handler>
"", "", "A");
register_command("yellow", &chat_command_handler::do_network_send_req_arg,
"", "", "A");
register_command("adminmsg", &chat_command_handler::do_network_send_req_arg,
_("Send a message to the server admins currently online"), "");
register_command("report", &chat_command_handler::do_network_send_req_arg,
_("Report abuse, rule violations, etc. to the server moderators. "
"Make sure to mention relevant nicks, etc."), "");
register_alias("report", "adminmsg"); // deprecated
register_command("emote", &chat_command_handler::do_emote,
_("Send an emotion or personal action in chat."), _("<message>"));
register_alias("emote", "me");
register_command("whisper", &chat_command_handler::do_whisper,
_("Sends a private message. "
"You can’t send messages to players that don’t control "
"a side in a running game you are in."), _("<nick> <message>"));
"You cannot send private messages to players in a running game you observe or play in."),
_("<nick> <message>"));
register_alias("whisper", "msg");
register_alias("whisper", "m");
register_command("log", &chat_command_handler::do_log,
@ -2669,8 +2671,8 @@ void chat_handler::send_command(const std::string& cmd, const std::string& args
data.add_child("query")["type"] = "lobbymsg #" + args;
} else if (cmd == "yellow") {
data.add_child("query")["type"] = "lobbymsg <255,255,0>" + args;
} else if (cmd == "adminmsg") {
data.add_child("query")["type"] = "adminmsg " + args;
} else if (cmd == "report") {
data.add_child("query")["type"] = "report " + args;
} else if (cmd == "join") {
data.add_child("room_join")["room"] = args;
} else if (cmd == "part") {

1
src/server/server.cpp
View file

@ -388,6 +388,7 @@ void server::setup_handlers()
cmd_handlers_["games"] = &server::games_handler;
cmd_handlers_["wml"] = &server::wml_handler;
cmd_handlers_["netstats"] = &server::netstats_handler;
cmd_handlers_["report"] = &server::adminmsg_handler;
cmd_handlers_["adminmsg"] = &server::adminmsg_handler;
cmd_handlers_["pm"] = &server::pm_handler;
cmd_handlers_["privatemsg"] = &server::pm_handler;