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/PLNT.cpp | |
| parent | bf3d7e9ad76a9c06c2f7f5771311dc8ea481dd96 (diff) | |
| download | powder-1e32c545d9ca7f960cdd6f77714c7b2761880478.zip powder-1e32c545d9ca7f960cdd6f77714c7b2761880478.tar.gz | |
fix visual studio std::max problem
Diffstat (limited to 'src/simulation/elements/PLNT.cpp')
| -rw-r--r-- | src/simulation/elements/PLNT.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/PLNT.cpp b/src/simulation/elements/PLNT.cpp index 84a83c2..e7439d1 100644 --- a/src/simulation/elements/PLNT.cpp +++ b/src/simulation/elements/PLNT.cpp @@ -107,7 +107,7 @@ int Element_PLNT::update(UPDATE_FUNC_ARGS) //#TPT-Directive ElementHeader Element_PLNT static int graphics(GRAPHICS_FUNC_ARGS) int Element_PLNT::graphics(GRAPHICS_FUNC_ARGS) { - float maxtemp = fmax(cpart->tmp2, cpart->temp); + float maxtemp = std::max((float)cpart->tmp2, cpart->temp); if (maxtemp > 300) { *colr += (int)restrict_flt((maxtemp-300)/5,0,58); |