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

remove support for side=all

Browse source
This commit is contained in:
Iurii Chernyi 2011-05-08 11:44:35 +00:00
parent aa85637df5
commit a5bd07e2bf
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game_events.cpp
View file

@ -514,8 +514,6 @@ namespace game_events {
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 @@ namespace game_events {
}
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();
}

3
src/side_filter.cpp
View file

@ -79,8 +79,7 @@ static bool check_side_number(const team &t, const std::string &str)
{
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;
}