diff options
| author | Einar Johan Trøan Sømåen | 2012-08-31 17:28:37 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-31 17:28:37 +0200 |
| commit | b01f09e82fd254823a839a8d4f622dc4d35bde6a (patch) | |
| tree | d7f5887067004e9909417540e5607b23b845b907 | |
| parent | d5f92497e6f15fab1c7f09bdf9a3f9c86982d35f (diff) | |
| download | scummvm-rg350-b01f09e82fd254823a839a8d4f622dc4d35bde6a.tar.gz scummvm-rg350-b01f09e82fd254823a839a8d4f622dc4d35bde6a.tar.bz2 scummvm-rg350-b01f09e82fd254823a839a8d4f622dc4d35bde6a.zip | |
WINTERMUTE: Use <math.h> instead of <cmath>
| -rw-r--r-- | engines/wintermute/base/scriptables/script_ext_math.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/math/math_util.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/base/scriptables/script_ext_math.cpp b/engines/wintermute/base/scriptables/script_ext_math.cpp index 906d807275..f7d0ba20b9 100644 --- a/engines/wintermute/base/scriptables/script_ext_math.cpp +++ b/engines/wintermute/base/scriptables/script_ext_math.cpp @@ -31,7 +31,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/persistent.h"
#include "common/math.h"
-#include <cmath>
+#include <math.h>
namespace Wintermute {
diff --git a/engines/wintermute/math/math_util.cpp b/engines/wintermute/math/math_util.cpp index 4a308a914e..434e0e016b 100644 --- a/engines/wintermute/math/math_util.cpp +++ b/engines/wintermute/math/math_util.cpp @@ -27,14 +27,14 @@ */
#include "engines/wintermute/math/math_util.h"
-#include <cmath>
+#include <math.h>
namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
float MathUtil::round(float val) {
float result = floor(val);
- if (val - result >= 0.5) {
+ if (val - result >= 0.5f) {
result += 1.0;
}
return result;
|