--- lincity-ng-git-b1282a2c2.old/src/lincity-ng/EconomyGraph.cpp +++ lincity-ng-git-b1282a2c2/src/lincity-ng/EconomyGraph.cpp @@ -54,6 +54,8 @@ #include "lincity/world.hpp" // for World #include "tinygettext/gettext.hpp" // for _ +#define my_max(a,b) (((a) > (b)) ? (a) : (b)) + EconomyGraph::EconomyGraph() { labelTextureMIN = 0; labelTexturePRT = 0; @@ -200,9 +202,9 @@ space.p2 - Vector2(i, 0))); // glEnable(GL_LINE_SMOOTH); - val = std::max(0.f, log((float)pop) + popScale0) * popScale1; + val = my_max(0.f, log((float)pop) + popScale0) * popScale1; valP = !popPrev ? val : - std::max(0.f, log((float)popPrev) + popScale0) * popScale1; + my_max(0.f, log((float)popPrev) + popScale0) * popScale1; painter.setLineColor(brown); painter.drawLine( space.p2 - half