Fixes occurrences of `-Wtype-limits`, `-Wmaybe-uninitialized`, `-Wduplicated-branches`. (cherry picked from commit 02e4e208ef989d5e9ee509fce224852bf9070f88)
@@ -1460,7 +1460,11 @@ bool String::parse_utf8(const char *p_utf8, int p_len, bool p_skip_cr) {
int skip = 0;
while (ptrtmp != ptrtmp_limit && *ptrtmp) {
if (skip == 0) {
+#if CHAR_MIN == 0
+ uint8_t c = *ptrtmp;
+#else
uint8_t c = *ptrtmp >= 0 ? *ptrtmp : uint8_t(256 + *ptrtmp);
+#endif
if (p_skip_cr && c == '\r') {
ptrtmp++;
@@ -1205,10 +1205,10 @@ public:
struct MipMaps {
struct Size {
- GLuint fbo;
- GLuint color;
- int width;
- int height;
+ GLuint fbo = 0;
+ GLuint color = 0;
+ int width = 0;
+ int height = 0;
};
Vector<Size> sizes;
@@ -1339,9 +1339,9 @@ public:
struct Effects {
@@ -160,7 +160,7 @@ struct CSGBrushOperation {
struct Face2D {
- int vertex_idx[3];
+ int vertex_idx[3] = {};
Vector<Vertex2D> vertices;
@@ -168,7 +168,7 @@ struct CSGBrushOperation {
Plane plane;
Transform to_2D;
Transform to_3D;
- float vertex_snap2;
+ float vertex_snap2 = 0.0;
inline int _get_point_idx(const Vector2 &p_point);
inline int _add_vertex(const Vertex2D &p_vertex);
@@ -1696,11 +1696,7 @@ Variant VisualScriptInstance::_call_internal(const StringName &p_method, void *p
}
next = node->sequence_outputs[output];
- if (next) {
- VSDEBUG("GOT NEXT NODE - " + itos(next->get_id()));
- } else {
- VSDEBUG("GOT NEXT NODE - NULL");
- }
+ VSDEBUG("GOT NEXT NODE - " + (next ? itos(next->get_id()) : "NULL"));
if (flow_stack) {
@@ -115,8 +115,8 @@ bool PhysicsDirectSpaceStateSW::intersect_ray(const Vector3 &p_from, const Vecto
bool collided = false;
Vector3 res_point, res_normal;
- int res_shape;
- const CollisionObjectSW *res_obj;
+ int res_shape = 0;
+ const CollisionObjectSW *res_obj = nullptr;
real_t min_d = 1e10;
for (int i = 0; i < amount; i++) {
@@ -137,8 +137,8 @@ bool Physics2DDirectSpaceStateSW::intersect_ray(const Vector2 &p_from, const Vec
Vector2 res_point, res_normal;
- const CollisionObject2DSW *res_obj;
+ const CollisionObject2DSW *res_obj = nullptr;