Author: ai0867
Date: Sun Sep 21 03:04:14 2008
New Revision: 29599
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29599&view=rev
Log:
* Address Bug #7492 (friend/ignore lists now accept lists).
Modified:
trunk/changelog
trunk/src/menu_events.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=29599&r1=29598&r2=29599&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Sun Sep 21 03:04:14 2008
@@ -23,6 +23,7 @@
* Various minor cleanups and refactoring of the new widgets.
* Added a new scroll label widget.
* Allowed usage of wildcards (? and *) in friend and ignore lists.
+ * Allowed usage of lists in /friend, /ignore and /remove commands.
* WML engine:
* New command, [store_time_of_day], makes it possible to store ToD info
in a WML array/container.
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=29599&r1=29598&r2=29599&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Sun Sep 21 03:04:14 2008
@@ -2466,10 +2466,12 @@
const std::string& tmp = preferences::get_ignores();
print("ignores list", tmp.empty() ? "(empty)" : tmp);
} else {
- if (preferences::add_ignore(get_arg(1))) {
- print("ignore", _("Added to ignore list: ") +
get_arg(1));
- } else {
- command_failed(_("Invalid username: ") +
get_arg(1));
+ for(int i = 1;!get_arg(i).empty();i++){
+ if (preferences::add_ignore(get_arg(i))) {
+ print("ignore", _("Added to ignore
list: ") + get_arg(i));
+ } else {
+ command_failed(_("Invalid username: ")
+ get_arg(i));
+ }
}
}
}
@@ -2479,18 +2481,22 @@
const std::string& tmp = preferences::get_friends();
print("friends list", tmp.empty() ? "(empty)" : tmp);
} else {
- if (preferences::add_friend(get_arg(1))) {
- print("friend", _("Added to friends list: ") +
get_arg(1));
- } else {
- command_failed(_("Invalid username: ") +
get_arg(1));
+ for(int i = 1;!get_arg(i).empty();i++){
+ if (preferences::add_friend(get_arg(i))) {
+ print("friend", _("Added to friends
list: ") + get_arg(i));
+ } else {
+ command_failed(_("Invalid username: ")
+ get_arg(i));
+ }
}
}
}
void chat_command_handler::do_remove()
{
- preferences::remove_friend(get_arg(1));
- preferences::remove_ignore(get_arg(1));
- print("list", _("Removed from list: ") + get_arg(1));
+ for(int i = 1;!get_arg(i).empty();i++){
+ preferences::remove_friend(get_arg(i));
+ preferences::remove_ignore(get_arg(i));
+ print("list", _("Removed from list: ") + get_arg(i));
+ }
}
void chat_command_handler::do_display()
{
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
