From 31fcb1bfaa2d6cdb6edf9736567ed2068367cf98 Mon Sep 17 00:00:00 2001 From: wolfy1339 Date: Mon, 26 Mar 2018 10:13:34 -0400 Subject: [PATCH] Fix some errors produced by clang --- src/simulation/Air.cpp | 2 +- src/simulation/elements/LIGH.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/simulation/Air.cpp b/src/simulation/Air.cpp index 9bb04cec4f..30709825e0 100644 --- a/src/simulation/Air.cpp +++ b/src/simulation/Air.cpp @@ -240,7 +240,7 @@ void Air::update_air(void) if ((dx*advDistanceMult>1.0f || dy*advDistanceMult>1.0f) && (tx>=2 && tx=2 && tyabs(dy)) + if (std::abs(dx)>std::abs(dy)) { stepX = (dx<0.0f) ? 1 : -1; stepY = -dy/fabsf(dx); diff --git a/src/simulation/elements/LIGH.cpp b/src/simulation/elements/LIGH.cpp index e7b2df96fd..87497cab68 100644 --- a/src/simulation/elements/LIGH.cpp +++ b/src/simulation/elements/LIGH.cpp @@ -239,7 +239,7 @@ int Element_LIGH::LIGH_nearest_part(Simulation * sim, int ci, int max_d) { if (sim->parts[i].type && sim->parts[i].life && i!=ci && sim->parts[i].type!=PT_LIGH && sim->parts[i].type!=PT_THDR && sim->parts[i].type!=PT_NEUT && sim->parts[i].type!=PT_PHOT) { - ndistance = abs(cx-sim->parts[i].x)+abs(cy-sim->parts[i].y);// Faster but less accurate Older: sqrt(pow(cx-parts[i].x, 2)+pow(cy-parts[i].y, 2)); + ndistance = std::abs(cx-sim->parts[i].x)+std::abs(cy-sim->parts[i].y);// Faster but less accurate Older: sqrt(pow(cx-parts[i].x, 2)+pow(cy-parts[i].y, 2)); if (ndistance