diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-09-15 21:29:18 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-09-15 21:29:18 +0000 |
| commit | e55638d081e2e1ff6fbc06e0e8ac0381a04308e7 (patch) | |
| tree | 511ccb478adf2acd3cc93f66d217b09f3e3a06dc /src/math | |
| parent | f612f19e095b8d0ba49f5bcdec6a582824315d69 (diff) | |
updated comments, updated buy menu, info support for map window, added const to target selection
Diffstat (limited to 'src/math')
| -rw-r--r-- | src/math/functions.cc | 6 | ||||
| -rw-r--r-- | src/math/functions.h | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/math/functions.cc b/src/math/functions.cc index c4b832c..7fb40be 100644 --- a/src/math/functions.cc +++ b/src/math/functions.cc @@ -66,10 +66,10 @@ float sgnf(float value) { if (value < 0) return -1; - else if (value == 0) - return 0; + else if (value > 0) + return 1; - return 1; + return 0; } } // namespace math diff --git a/src/math/functions.h b/src/math/functions.h index c301969..5a53d44 100644 --- a/src/math/functions.h +++ b/src/math/functions.h @@ -31,7 +31,7 @@ int max(int a, int b); /** The value returned will be in the interval [0-max] * @param max the maximum value returned **/ -float randomf(const float max = 1); +float randomf(const float max = 1.0f); /// returns a random integer /** The value returned will be in the interval [0-(max-1)] @@ -58,12 +58,9 @@ inline void clamp(float &value, const float min = 0.0f, const float max = 1.0f) } /// return the absolute value of a float -inline float absf(float f) +inline float absf(const float f) { - if (f < 0) - return -f; - else - return f; + return ( f < 0.0f ? -f : f ); } } // namespace math |