mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r12573) -Codechange: use defined constants instead of numbers in math_func.hpp

This commit is contained in:
smatz 2008-04-04 20:34:09 +00:00
parent a7d885e4c6
commit fb379b522d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/math_func.hpp
View File

@ -163,8 +163,8 @@ static inline uint ClampU(const uint a, const uint min, const uint max)
*/
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 int32 ClampToI32(const int64 a)
*/
static inline uint16 ClampToU16(const uint64 a)
{
return (uint16)(a <= 0xFFFFU ? a : 0xFFFFU);
return (uint16)(a <= UINT16_MAX ? a : UINT16_MAX);
}
/**

15
src/stdafx.h
View File

@ -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>