fix unit filter always evaluating [and] even if it is not needed.

wesnoth · May 31, 2018 · af6559a · af6559a
1 parent 8c3673d
commit af6559a
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/units/filter.cpp b/src/units/filter.cpp
@@ -244,17 +244,15 @@ bool unit_filter_compound::matches(const unit_filter_args& args) const
 
 	// Handle [and], [or], and [not] with in-order precedence
 	for(const auto & filter : cond_children_) {
-		bool child_res = filter.second.matches(args);
-
 		switch (filter.first.v) {
 		case CONDITIONAL_TYPE::AND:
-			res = res && child_res;
+			res = res && filter.second.matches(args);
 			break;
 		case CONDITIONAL_TYPE::OR:
-			res = res || child_res;
+			res = res || filter.second.matches(args);
 			break;
 		case CONDITIONAL_TYPE::NOT:
-			res = res && !child_res;
+			res = res && !filter.second.matches(args);
 			break;
 		}
 	}