(svn r12572) -Fix (r12192): min() has 32bit arguments, clamping of 64bit values didn't work

17 years ago · 6a501c85fc
parent 1db6c4d55e
commit 6a501c85fc
1 changed files with 1 additions and 1 deletions
--- a/src/core/math_func.hpp
+++ b/src/core/math_func.hpp
@ -177,7 +177,7 @@ static inline int32 ClampToI32(const int64 a)
 */
 static inline uint16 ClampToU16(const uint64 a)
 {
-	return min(a, 0xFFFF);
+	return (uint16)(a <= 0xFFFFU ? a : 0xFFFFU);
 }

 /**