Merge pull request #6705 from bencsikandrei/various_fixes_arrow_c_h_pp

Add explicit + some cleanup in arrow.h/cpp
wesnoth · May 13, 2022 · e5dbbf6 · e5dbbf6
2 parents 87d5746 + 985fdec
commit e5dbbf6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/arrow.cpp b/src/arrow.cpp
@@ -51,6 +51,7 @@ void arrow::hide()
 {
 	if(hidden_)
 		return;
+
 	hidden_ = true;
 
 	if(display* disp = display::get_singleton()) {
@@ -63,6 +64,7 @@ void arrow::show()
 {
 	if(!hidden_)
 		return;
+
 	hidden_ = false;
 
 	if(display* disp = display::get_singleton()) {
@@ -146,10 +148,7 @@ void arrow::draw_hex(const map_location& hex)
 
 bool arrow::valid_path(const arrow_path_t& path)
 {
-	if (path.size() >= 2)
-		return true;
-	else
-		return false;
+	return (path.size() >= 2);
 }
 
 void arrow::update_symbols()

diff --git a/src/arrow.hpp b/src/arrow.hpp
@@ -34,7 +34,7 @@ class arrow {
 	arrow(const arrow&) = delete;
 	arrow& operator=(const arrow&) = delete;
 
-	arrow(bool hidden = false);
+	explicit arrow(bool hidden = false);
 	virtual ~arrow();
 
 	/** Sets the arrow's visibility */