diff options
| author | jacob1 <jfu614@gmail.com> | 2012-11-16 01:23:38 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-11-16 01:23:38 (GMT) |
| commit | 1e32c545d9ca7f960cdd6f77714c7b2761880478 (patch) | |
| tree | 9800e5dbadcc53ed8f2c60762eb8b1abc88cb59f /src/simulation/elements/FWRK.cpp | |
| parent | bf3d7e9ad76a9c06c2f7f5771311dc8ea481dd96 (diff) | |
| download | powder-1e32c545d9ca7f960cdd6f77714c7b2761880478.zip powder-1e32c545d9ca7f960cdd6f77714c7b2761880478.tar.gz | |
fix visual studio std::max problem
Diffstat (limited to 'src/simulation/elements/FWRK.cpp')
| -rw-r--r-- | src/simulation/elements/FWRK.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/FWRK.cpp b/src/simulation/elements/FWRK.cpp index 6889f91..f05db69 100644 --- a/src/simulation/elements/FWRK.cpp +++ b/src/simulation/elements/FWRK.cpp @@ -61,7 +61,7 @@ int Element_FWRK::update(UPDATE_FUNC_ARGS) gx += sinf(angle)*sim->elements[PT_FWRK].Gravity*0.5f; gy += cosf(angle)*sim->elements[PT_FWRK].Gravity*0.5f; } - gmax = fmaxf(fabsf(gx), fabsf(gy)); + gmax = std::max(fabsf(gx), fabsf(gy)); if (sim->eval_move(PT_FWRK, (int)(x-(gx/gmax)+0.5f), (int)(y-(gy/gmax)+0.5f), NULL)) { multiplier = 15.0f/sqrtf(gx*gx+gy*gy); |