diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-05-16 19:59:53 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-05-16 20:15:03 -0400 |
| commit | 11a96e4901ce54c4646e47866f7a66cd9034c16b (patch) | |
| tree | b7cefb2e99f0faa4f5141c95aa6a7d169d21968b /src/noise.cpp | |
| parent | fb36c471d7c35bafec9c70028fbabf4ea4838ad2 (diff) | |
| download | minetest-11a96e4901ce54c4646e47866f7a66cd9034c16b.tar.gz minetest-11a96e4901ce54c4646e47866f7a66cd9034c16b.tar.bz2 minetest-11a96e4901ce54c4646e47866f7a66cd9034c16b.zip | |
Add -Wsign-compare for Clang builds and fix some signed/unsigned compiler warnings
Diffstat (limited to 'src/noise.cpp')
| -rw-r--r-- | src/noise.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/noise.cpp b/src/noise.cpp index f5d985fff..8c42be3cf 100644 --- a/src/noise.cpp +++ b/src/noise.cpp @@ -590,8 +590,8 @@ void Noise::gradientMap2D( int seed) { float v00, v01, v10, v11, u, v, orig_u; - int index, i, j, x0, y0, noisex, noisey; - int nlx, nly; + u32 index, i, j, x0, y0, noisex, noisey; + u32 nlx, nly; bool eased = np.flags & (NOISE_FLAG_DEFAULTS | NOISE_FLAG_EASED); Interp2dFxn interpolate = eased ? @@ -604,8 +604,8 @@ void Noise::gradientMap2D( orig_u = u; //calculate noise point lattice - nlx = (int)(u + sx * step_x) + 2; - nly = (int)(v + sy * step_y) + 2; + nlx = (u32)(u + sx * step_x) + 2; + nly = (u32)(v + sy * step_y) + 2; index = 0; for (j = 0; j != nly; j++) for (i = 0; i != nlx; i++) @@ -655,8 +655,8 @@ void Noise::gradientMap3D( float v000, v010, v100, v110; float v001, v011, v101, v111; float u, v, w, orig_u, orig_v; - int index, i, j, k, x0, y0, z0, noisex, noisey, noisez; - int nlx, nly, nlz; + u32 index, i, j, k, x0, y0, z0, noisex, noisey, noisez; + u32 nlx, nly, nlz; Interp3dFxn interpolate = (np.flags & NOISE_FLAG_EASED) ? triLinearInterpolation : triLinearInterpolationNoEase; @@ -671,9 +671,9 @@ void Noise::gradientMap3D( orig_v = v; //calculate noise point lattice - nlx = (int)(u + sx * step_x) + 2; - nly = (int)(v + sy * step_y) + 2; - nlz = (int)(w + sz * step_z) + 2; + nlx = (u32)(u + sx * step_x) + 2; + nly = (u32)(v + sy * step_y) + 2; + nlz = (u32)(w + sz * step_z) + 2; index = 0; for (k = 0; k != nlz; k++) for (j = 0; j != nly; j++) |