Author: anonymissimus
Date: Tue Mar 27 21:50:05 2012
New Revision: 53671
URL: http://svn.gna.org/viewcvs/wesnoth?rev=53671&view=rev
Log:
add support for ranges of sides in SSF (patch #3208 by Brilliand)
Modified:
trunk/src/side_filter.cpp
Modified: trunk/src/side_filter.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/side_filter.cpp?rev=53671&r1=53670&r2=53671&view=diff
==============================================================================
--- trunk/src/side_filter.cpp (original)
+++ trunk/src/side_filter.cpp Tue Mar 27 21:50:05 2012
@@ -71,13 +71,16 @@
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())
- {
- return false;
- }
- return true;
+ std::vector<std::pair<int,int> > ranges =
utils::parse_ranges(str);
+ int side_number = t.side();
+
+ std::vector<std::pair<int,int> >::const_iterator range,
range_end = ranges.end();
+ for (range = ranges.begin(); range != range_end; ++range) {
+ if(side_number >= range->first && side_number <=
range->second) {
+ return true;
+ }
+ }
+ return false;
}
bool side_filter::match_internal(const team &t) const
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
