From 2481ea27ce0f423f3e6f3522539d20e1500cf572 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Mon, 2 Apr 2018 23:51:08 +0200 Subject: Fix many issues reported by clang-tidy (#7189) * Fix many issues reported by clang-tidy We have many issues in code related to some performance to float <-> double. Clang-tidy reported it in performance-type-promotion-in-math-fn I fixed many of them. It's not ready for a promote to blocking Also fix some value which should be const-ref --- src/mapgen/mapgen_carpathian.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mapgen/mapgen_carpathian.cpp') diff --git a/src/mapgen/mapgen_carpathian.cpp b/src/mapgen/mapgen_carpathian.cpp index 0cde17037..db276ffba 100644 --- a/src/mapgen/mapgen_carpathian.cpp +++ b/src/mapgen/mapgen_carpathian.cpp @@ -205,7 +205,7 @@ inline float MapgenCarpathian::getLerp(float noise1, float noise2, float mod) float MapgenCarpathian::getSteps(float noise) { float w = 0.5f; - float k = floor(noise / w); + float k = std::floor(noise / w); float f = (noise - k * w) / w; float s = std::fmin(2.f * f, 1.f); return (k + s) * w; @@ -342,8 +342,8 @@ float MapgenCarpathian::terrainLevelAtPoint(s16 x, s16 z) std::fmax(std::fmin(hill1, hill2), std::fmin(hill3, hill4)); // Rolling hills - float hill_mnt = hilliness * pow(n_hills, 2.f); - float hills = pow(hter, 3.f) * hill_mnt; + float hill_mnt = hilliness * std::pow(n_hills, 2.f); + float hills = std::pow(hter, 3.f) * hill_mnt; // Ridged mountains float ridge_mnt = hilliness * (1.f - std::fabs(n_ridge_mnt)); -- cgit v1.2.3