Author: crab
Date: Sun May 8 13:44:35 2011
New Revision: 49424
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49424&view=rev
Log:
remove support for side=all
Modified:
trunk/src/game_events.cpp
trunk/src/side_filter.cpp
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=49424&r1=49423&r2=49424&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Sun May 8 13:44:35 2011
@@ -514,8 +514,6 @@
std::set<int> get_sides_set(const vconfig& cfg, const bool only_ssf)
{
- std::set<int> result;
-
if(only_ssf) {
side_filter filter(cfg);
return filter.get_teams();
@@ -530,10 +528,14 @@
}
if (sides.blank()) {
+
put_wml_message("error","empty side= and no
[filter_side] is deprecated");
+ std::set<int> result;
result.insert(1); // we make sure the set is not empty
and the current default is maintained
return result;
}
+ // uncomment if the decision will be made to make [filter_side]
the only & final syntax for specifying sides
+ // put_wml_message("error","specifying side via inline side= is
deprecated, use [filter_side] ");
side_filter filter(sides.str());
return filter.get_teams();
}
Modified: trunk/src/side_filter.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/side_filter.cpp?rev=49424&r1=49423&r2=49424&view=diff
==============================================================================
--- trunk/src/side_filter.cpp (original)
+++ trunk/src/side_filter.cpp Sun May 8 13:44:35 2011
@@ -79,8 +79,7 @@
{
std::vector<std::string> list = utils::split(str);
std::string side_number = str_cast(t.side());
- if ((std::find(list.begin(),list.end(),side_number)==list.end())
- && (std::find(list.begin(),list.end(),"all")==list.end()))
+ if (std::find(list.begin(),list.end(),side_number)==list.end())
{
return false;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
