Author: soliton
Date: Sun May 17 01:38:32 2009
New Revision: 35680

URL: http://svn.gna.org/viewcvs/wesnoth?rev=35680&view=rev
Log:
* Fixed bug #7547: Add possibility to unban/unmute in a multiplayer game

Modified:
    trunk/changelog
    trunk/players_changelog
    trunk/src/menu_events.cpp

Modified: trunk/changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=35680&r1=35679&r2=35680&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Sun May 17 01:38:32 2009
@@ -80,6 +80,7 @@
    * Implemented automatic saving of game replays.
    * Implemented the adminmsg command to allow players to send messages to
      currently available admins. (FR #9218)
+   * Fixed bug #7547: Add possibility to unban/unmute in a multiplayer game
  * Savegames
    * Providing a new simpler interface for dealing with savegames
  * User interface:

Modified: trunk/players_changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/players_changelog?rev=35680&r1=35679&r2=35680&view=diff
==============================================================================
--- trunk/players_changelog (original)
+++ trunk/players_changelog Sun May 17 01:38:32 2009
@@ -38,6 +38,12 @@
       Chinese (Traditional), Czech, Dutch, German, Finnish, French, Hebrew,
       Hungarian, Indonesian, Italian, Lithuanian, Norwegian, Polish, Russian,
       Serbian, Slovak, Swedish, Turkish.
+
+  * Multiplayer
+    * Implemented automatic saving of game replays.
+    * Implemented the adminmsg command to allow players to send messages to
+      currently available admins. (FR #9218)
+    * Fixed bug #7547: Add possibility to unban/unmute in a multiplayer game
 
   * Units
     * Added the Water Serpent.

Modified: trunk/src/menu_events.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=35680&r1=35679&r2=35680&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Sun May 17 01:38:32 2009
@@ -2044,12 +2044,17 @@
                                register_command("ban", 
&chat_command_handler::do_network_send_req_arg,
                                        _("Ban and kick a player or observer. 
If he is not in the"
                                        " game but on the server he will only 
be banned."), "<nick>");
+                               register_command("unban", 
&chat_command_handler::do_network_send_req_arg,
+                                       _("Unban a user. He does not have to be 
in the game but on"
+                                       " the server."), "<nick>");
                                register_command("kick", 
&chat_command_handler::do_network_send_req_arg,
                                        _("Kick a player or observer."), 
"<nick>");
                                register_command("mute", 
&chat_command_handler::do_network_send,
                                        _("Mute an observer. Without an 
argument displays the mute status."), "<nick>");
+                               register_command("unmute", 
&chat_command_handler::do_network_send,
+                                       _("Unmute an observer. Without an 
argument unmutes everyone."), "<nick>");
                                register_command("muteall", 
&chat_command_handler::do_network_send,
-                                       _("Mute all observers."), "");
+                                       _("Mute/Unmute all observers. 
(toggles)"), "");
                                register_command("ping", 
&chat_command_handler::do_network_send,
                                        "");
                                register_command("green", 
&chat_command_handler::do_network_send_req_arg,
@@ -2363,7 +2368,8 @@
                        data.add_child(cmd);
                } else if (cmd == "query") {
                        data.add_child(cmd)["type"] = args;
-               } else if (cmd == "ban" || cmd == "kick" || cmd == "mute") {
+               } else if (cmd == "ban" || cmd == "unban" || cmd == "kick"
+               || cmd == "mute" || cmd == "unmute") {
                        data.add_child(cmd)["username"] = args;
                } else if (cmd == "ping") {
                        data[cmd] = lexical_cast<std::string>(time(NULL));


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to