mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-13 03:44:00 +02:00
Code Issues Projects Releases Wiki Activity

- fixed compile problem with abs on a float

Browse Source
This commit is contained in:
Mark Vejvoda
2010-09-14 20:18:22 +00:00
parent f84a710d2c
commit c9be7a8677
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/shared_lib/sources/map/map_preview.cpp
View File

@@ -12,8 +12,8 @@
#include "map_preview.h" #include "map_preview.h"
//#include <cmath>
#include "math_wrapper.h" #include "math_wrapper.h"
#include <cstdlib>
#include <stdexcept> #include <stdexcept>
using namespace Shared::Util; using namespace Shared::Util;
@@ -247,15 +247,15 @@ void MapPreview::pirateChangeHeight(int x, int y, int height, int radius) {
} }
// Determine which gradients to use and take a weighted average // Determine which gradients to use and take a weighted average
if (abs(normIf) > abs(normJf)) { if (fabs(normIf) > fabs(normJf)) {
usedGrad = usedGrad =
gradient[normI[0]] [normJ[0]] * abs(normJf) + gradient[normI[0]] [normJ[0]] * fabs(normJf) +
gradient[normI[0]] [normJ[1]] * (1 - abs(normJf)); gradient[normI[0]] [normJ[1]] * (1 - fabs(normJf));
} }
else if (abs(normIf) < abs(normJf)) { else if (fabs(normIf) < fabs(normJf)) {
usedGrad = usedGrad =
gradient[normI[0]] [normJ[0]] * abs(normIf) + gradient[normI[0]] [normJ[0]] * fabs(normIf) +
gradient[normI[1]] [normJ[0]] * (1 - abs(normIf)); gradient[normI[1]] [normJ[0]] * (1 - fabs(normIf));
} }
else { else {
usedGrad = usedGrad =