revert rename bool_or_empty()

newfrenchy83 · Oct 27, 2023 · 1ef867e · 1ef867e
1 parent 40f318b
commit 1ef867e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/units/unit.cpp b/src/units/unit.cpp
@@ -1435,7 +1435,7 @@ static bool matches_ability_filter(const config & cfg, const std::string& tag_na
 	if(!bool_matches_if_present_and_valid(filter, cfg, "affect_self", true))
 		return false;
 
-	if(!matches_if_attribute_boolean_or_missing(filter, cfg, "affect_allies"))
+	if(!bool_or_empty(filter, cfg, "affect_allies"))
 		return false;
 
 	if(!bool_matches_if_present_and_valid(filter, cfg, "affect_enemies", false))

diff --git a/src/utils/config_filters.cpp b/src/utils/config_filters.cpp
@@ -103,7 +103,7 @@ bool utils::config_filters::double_matches_if_present(const config& filter, cons
 	return in_ranges<double>(cfg[attribute].to_double(value_def), utils::parse_ranges_real(filter[attribute].str()));
 }
 
-bool utils::config_filters::matches_if_attribute_boolean_or_missing(const config& filter, const config& cfg, const std::string& attribute)
+bool utils::config_filters::bool_or_empty(const config& filter, const config& cfg, const std::string& attribute)
 {
 	if(!filter.has_attribute(attribute)) {
 		return true;

diff --git a/src/utils/config_filters.hpp b/src/utils/config_filters.hpp
@@ -67,6 +67,6 @@ bool int_matches_if_present_or_negative(
 bool string_matches_if_present(
 	const config& filter, const config& cfg, const std::string& attribute, const std::string& def);
 
-bool matches_if_attribute_boolean_or_missing(const config& filter, const config& cfg, const std::string& attribute);
+bool bool_or_empty(const config& filter, const config& cfg, const std::string& attribute);
 
 } // namespace utils::config_filters