Merge pull request #11057 from hpvb/fix-various-warnings

Fix various assorted warnings

5 files changed, 48 insertions, 44 deletions

diff --git a/scene/2d/line_builder.cpp b/scene/2d/line_builder.cpp
index 1235013af4..53db30e3ce 100644
--- a/scene/2d/line_builder.cpp
+++ b/scene/2d/line_builder.cpp
@@ -173,13 +173,15 @@ void LineBuilder::build() {
 
 	strip_begin(pos_up0, pos_down0, color0, uvx0);
 
-	//  pos_up0 ------------- pos_up1 --------------------
-	//     |                     |
-	//   pos0 - - - - - - - - - pos1 - - - - - - - - - pos2
-	//     |                     |
-	// pos_down0 ------------ pos_down1 ------------------
-	//
-	//   i-1                     i                      i+1
+	/*
+	 *  pos_up0 ------------- pos_up1 --------------------
+	 *     |                     |
+	 *   pos0 - - - - - - - - - pos1 - - - - - - - - - pos2
+	 *     |                     |
+	 * pos_down0 ------------ pos_down1 ------------------
+	 *
+	 *   i-1                     i                      i+1
+	 */
 
 	// http://labs.hyperandroid.com/tag/opengl-lines
 	// (not the same implementation but visuals help a lot)
@@ -206,17 +208,19 @@ void LineBuilder::build() {
 			inner_normal1 = -u1 * hw;
 		}
 
-		// ---------------------------
-		//                        /
-		// 0                     /    1
-		//                      /          /
-		// --------------------x------    /
-		//                    /          /    (here shown with orientation == DOWN)
-		//                   /          /
-		//                  /          /
-		//                 /          /
-		//                     2     /
-		//                          /
+		/*
+		 * ---------------------------
+		 *                        /
+		 * 0                     /    1
+		 *                      /          /
+		 * --------------------x------    /
+		 *                    /          /    (here shown with orientation == DOWN)
+		 *                   /          /
+		 *                  /          /
+		 *                 /          /
+		 *                     2     /
+		 *                          /
+		 */
 
 		// Find inner intersection at the joint
 		Vector2 corner_pos_in, corner_pos_out;
@@ -315,13 +319,14 @@ void LineBuilder::build() {
 		// Add joint geometry
 		if (current_joint_mode != LINE_JOINT_SHARP) {
 
-			// ________________ cbegin
-			//               / \
-			//              /   \
-			// ____________/_ _ _\ cend
-			//             |     |
-			//             |     |
-			//             |     |
+			/* ________________ cbegin
+			 *               / \
+			 *              /   \
+			 * ____________/_ _ _\ cend
+			 *             |     |
+			 *             |     |
+			 *             |     |
+			 */
 
 			Vector2 cbegin, cend;
 			if (orientation == UP) {
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index de17416d8e..d4ebf55f92 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -2304,7 +2304,7 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
 				int col, h, section;
 				TreeItem *it = _find_item_at_pos(root, mpos, col, h, section);
 
-				if (drop_mode_flags && it != drop_mode_over || section != drop_mode_section) {
+				if ((drop_mode_flags && it != drop_mode_over) || section != drop_mode_section) {
 					drop_mode_over = it;
 					drop_mode_section = section;
 					update();
diff --git a/scene/resources/curve.cpp b/scene/resources/curve.cpp
index 7fbaa1f73c..e1ad9e4cb0 100644
--- a/scene/resources/curve.cpp
+++ b/scene/resources/curve.cpp
@@ -331,18 +331,19 @@ real_t Curve::interpolate_local_nocheck(int index, real_t local_offset) const {
 	const Point a = _points[index];
 	const Point b = _points[index + 1];
 
-	// Cubic bezier
-
-	//       ac-----bc
-	//      /         \
-	//     /           \     Here with a.right_tangent > 0
-	//    /             \    and b.left_tangent < 0
-	//   /               \
-	//  a                 b
-	//
-	//  |-d1--|-d2--|-d3--|
-	//
-	// d1 == d2 == d3 == d / 3
+	/* Cubic bezier
+	 *
+	 *       ac-----bc
+	 *      /         \
+	 *     /           \     Here with a.right_tangent > 0
+	 *    /             \    and b.left_tangent < 0
+	 *   /               \
+	 *  a                 b
+	 *
+	 *  |-d1--|-d2--|-d3--|
+	 *
+	 * d1 == d2 == d3 == d / 3
+	 */
 
 	// Control points are chosen at equal distances
 	real_t d = b.pos.x - a.pos.x;
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index c525ca600a..5d6f44dfef 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -92,7 +92,7 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
 
 			NODE_FROM_ID(nparent, n.parent);
 #ifdef DEBUG_ENABLED
-			if (!nparent && n.parent & FLAG_ID_IS_PATH) {
+			if (!nparent && (n.parent & FLAG_ID_IS_PATH)) {
 
 				WARN_PRINT(String("Parent path '" + String(node_paths[n.parent & FLAG_MASK]) + "' for node '" + String(snames[n.name]) + "' has vanished when instancing: '" + get_path() + "'.").ascii().get_data());
 			}
@@ -489,7 +489,7 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Map
 			// only save what has been changed
 			// only save changed properties in instance
 
-			if (E->get().usage & PROPERTY_USAGE_NO_INSTANCE_STATE || E->get().name == "__meta__") {
+			if ((E->get().usage & PROPERTY_USAGE_NO_INSTANCE_STATE) || E->get().name == "__meta__") {
 				//property has requested that no instance state is saved, sorry
 				//also, meta won't be overridden or saved
 				continue;
@@ -1288,7 +1288,7 @@ bool SceneState::is_node_instance_placeholder(int p_idx) const {
 
 	ERR_FAIL_INDEX_V(p_idx, nodes.size(), false);
 
-	return nodes[p_idx].instance >= 0 && nodes[p_idx].instance & FLAG_INSTANCE_IS_PLACEHOLDER;
+	return nodes[p_idx].instance >= 0 && (nodes[p_idx].instance & FLAG_INSTANCE_IS_PLACEHOLDER);
 }
 
 Ref<PackedScene> SceneState::get_node_instance(int p_idx) const {
@@ -1313,7 +1313,7 @@ String SceneState::get_node_instance_placeholder(int p_idx) const {
 
 	ERR_FAIL_INDEX_V(p_idx, nodes.size(), String());
 
-	if (nodes[p_idx].instance >= 0 && nodes[p_idx].instance & FLAG_INSTANCE_IS_PLACEHOLDER) {
+	if (nodes[p_idx].instance >= 0 && (nodes[p_idx].instance & FLAG_INSTANCE_IS_PLACEHOLDER)) {
 		return variants[nodes[p_idx].instance & FLAG_MASK];
 	}
 
diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp
index 52e080bdc8..ba356d89b1 100644
--- a/scene/resources/primitive_meshes.cpp
+++ b/scene/resources/primitive_meshes.cpp
@@ -230,7 +230,6 @@ void CapsuleMesh::_create_mesh_array(Array &p_arr) const {
 	prevrow = 0;
 	for (j = 0; j <= (rings + 1); j++) {
 		v = j;
-		w;
 
 		v /= (rings + 1);
 		w = sin(0.5 * Math_PI * v);
@@ -309,7 +308,6 @@ void CapsuleMesh::_create_mesh_array(Array &p_arr) const {
 	prevrow = 0;
 	for (j = 0; j <= (rings + 1); j++) {
 		v = j;
-		w;
 
 		v /= (rings + 1);
 		v += 1.0;