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

AI/Contexts: simplify range check

Browse source
This commit is contained in:
Charles Dang 2018-05-01 13:20:03 +11:00
parent b5cb4b2bcc
commit 6dca50ac10
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ai/contexts.cpp
View file

@ -1387,17 +1387,8 @@ bool readonly_context_impl::is_active(const std::string& time_of_day, const std:
}
}
if(turns.empty() == false) {
int turn = resources::tod_manager->turn();
const std::vector<std::string>& turns_list = utils::split(turns);
for(std::vector<std::string>::const_iterator j = turns_list.begin(); j != turns_list.end(); ++j) {
const std::pair<int, int> range = utils::parse_range(*j);
if(turn >= range.first && turn <= range.second) {
return true;
}
}
return false;
if(!turns.empty()) {
return in_ranges(resources::tod_manager->turn(), utils::parse_ranges(turns));
}
return true;