Mercurial > hg > openttd
changeset 8825:1603ed357fcb draft
(svn r12573) -Codechange: use defined constants instead of numbers in math_func.hpp
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Fri, 04 Apr 2008 20:34:09 +0000 |
| parents | f7bac453f496 |
| children | 7532ee3295c9 |
| files | src/core/math_func.hpp src/stdafx.h |
| diffstat | 2 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/math_func.hpp +++ b/src/core/math_func.hpp @@ -163,8 +163,8 @@ */ static inline int32 ClampToI32(const int64 a) { - if (a <= (int32)0x80000000) return 0x80000000; - if (a >= (int32)0x7FFFFFFF) return 0x7FFFFFFF; + if (a <= INT32_MIN) return INT32_MIN; + if (a >= INT32_MAX) return INT32_MAX; return (int32)a; } @@ -177,7 +177,7 @@ */ static inline uint16 ClampToU16(const uint64 a) { - return (uint16)(a <= 0xFFFFU ? a : 0xFFFFU); + return (uint16)(a <= UINT16_MAX ? a : UINT16_MAX); } /**
--- a/src/stdafx.h +++ b/src/stdafx.h @@ -32,12 +32,15 @@ #include <stdint.h> #endif #else - #define INT64_MAX (9223372036854775807LL) - #define INT64_MIN (-INT64_MAX - 1) - #define INT32_MAX (2147483647) - #define INT32_MIN (-INT32_MAX - 1) - #define INT16_MAX (32767) - #define INT16_MIN (-INT16_MAX - 1) + #define UINT64_MAX (18446744073709551615ULL) + #define INT64_MAX (9223372036854775807LL) + #define INT64_MIN (-INT64_MAX - 1) + #define UINT32_MAX (4294967295U) + #define INT32_MAX (2147483647) + #define INT32_MIN (-INT32_MAX - 1) + #define UINT16_MAX (65535U) + #define INT16_MAX (32767) + #define INT16_MIN (-INT16_MAX - 1) #endif #include <cstdio>