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

Add a way in [filter_wml] to match key values against a glob

Browse source 
(cherry-picked from commit 5ee9b09470)
This commit is contained in:
Celtic Minstrel 2018-03-29 00:13:23 -04:00
parent 165e8a63fa
commit 6c068684d6
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/config.cpp
View file

@ -27,6 +27,7 @@
#include "utils/functional.hpp"
#include "deprecation.hpp"
#include "version.hpp"
#include "serialization/string_utils.hpp"
#include <algorithm>
#include <cstdlib>
@ -1185,10 +1186,18 @@ bool config::matches(const config& filter) const
bool result = true;
for(const attribute& i : filter.attribute_range()) {
const attribute_value* v = get(i.first);
if(!v || *v != i.second) {
result = false;
break;
if(i.first.compare(0, 8, "glob_on_") == 0) {
const attribute_value* v = get(i.first.substr(8));
if(!v || !utils::wildcard_string_match(v->str(), i.second.str())) {
result = false;
break;
}
} else {
const attribute_value* v = get(i.first);
if(!v || *v != i.second) {
result = false;
break;
}
}
}