Rewrite some logic so C++11 considers it a boolean context

wesnoth · Jun 19, 2014 · ebaea58 · ebaea58
1 parent af2d16a
commit ebaea58
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/unit_map.hpp b/src/unit_map.hpp
@@ -227,10 +227,7 @@ class unit_map {
 		}
 
 		bool valid() const {
-			if(valid_for_dereference()) {
-				return static_cast<bool> (i_->second.unit);
-			}
-			return false;
+			return (valid_for_dereference() && i_->second.unit);
 		}
 
 		bool operator==(const iterator_base &rhs) const { return (tank_ == rhs.tank_) && ( i_ == rhs.i_ ); }