diff --git a/plugins/zone.cpp b/plugins/zone.cpp index 05da93fa2..d674cc55f 100644 --- a/plugins/zone.cpp +++ b/plugins/zone.cpp @@ -1366,12 +1366,12 @@ pair> createRaceFilter(vector &filter_ // guaranteed to exist. string race = filter_args[0]; - return { + return make_pair( "race of " + race, [race](df::unit *unit) -> bool { return getRaceName(unit) == race; } - }; + ); } pair> createAgeFilter(vector &filter_args) @@ -1392,12 +1392,12 @@ pair> createAgeFilter(vector &filter_a throw runtime_error(err.str()); } - return { + return make_pair( "age of exactly " + to_string(target_age), [target_age](df::unit *unit) -> bool { return getAge(unit, true) == target_age; } - }; + ); } pair> createMinAgeFilter(vector &filter_args) @@ -1418,12 +1418,12 @@ pair> createMinAgeFilter(vector &filte throw runtime_error(err.str()); } - return { + return make_pair( "minimum age of " + to_string(min_age), [min_age](df::unit *unit) -> bool { return getAge(unit, true) >= min_age; } - }; + ); } pair> createMaxAgeFilter(vector &filter_args) @@ -1444,12 +1444,12 @@ pair> createMaxAgeFilter(vector &filte throw runtime_error(err.str()); } - return { + return make_pair( "maximum age of " + to_string(max_age), [max_age](df::unit *unit) -> bool { return getAge(unit, true) <= max_age; } - }; + ); } // Filters that take arguments.