mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8846) -Fix 

Remove confusing superfluous parentheses
release/0.6
tron 2007-02-22 18:44:42 +00:00
parent 17dd1b7126
commit 8b94d4df22
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/macros.h
View File

@ -43,44 +43,43 @@ static inline uint clampu(uint a, uint min, uint max)
return a; return a;
} }
static inline int32 BIGMULSS(int32 a, int32 b, int shift) { static inline int32 BIGMULSS(int32 a, int32 b, int shift)
return (int32)(((int64)(a) * (int64)(b)) >> (shift)); {
return (int32)((int64)a * (int64)b >> shift);
} }
static inline uint32 BIGMULUS(uint32 a, uint32 b, int shift) { static inline uint32 BIGMULUS(uint32 a, uint32 b, int shift)
return (uint32)(((uint64)(a) * (uint64)(b)) >> (shift)); {
return (uint32)((uint64)a * (uint64)b >> shift);
} }
static inline int64 BIGMULS(int32 a, int32 b) { static inline int64 BIGMULS(int32 a, int32 b)
return (int64)(a) * (int64)(b); {
return (int64)a * (int64)b;
} }
/* OPT: optimized into an unsigned comparison */ /* OPT: optimized into an unsigned comparison */
//#define IS_INSIDE_1D(x, base, size) ((x) >= (base) && (x) < (base) + (size)) //#define IS_INSIDE_1D(x, base, size) ((x) >= (base) && (x) < (base) + (size))
#define IS_INSIDE_1D(x, base, size) ( (uint)((x) - (base)) < ((uint)(size)) ) #define IS_INSIDE_1D(x, base, size) ( (uint)((x) - (base)) < ((uint)(size)) )
template <typename T> template<typename T> static inline bool HASBIT(T x, int y)
static inline bool HASBIT(T x, int y)
{ {
return (x & (((T)1) << y)) != 0; return (x & ((T)1 << y)) != 0;
} }
template <typename T> template<typename T> static inline T SETBIT(T& x, int y)
static inline T SETBIT(T& x, int y)
{ {
return x |= (((T)1) << y); return x |= (T)1 << y;
} }
template <typename T> template<typename T> static inline T CLRBIT(T& x, int y)
static inline T CLRBIT(T& x, int y)
{ {
return x &= ~(((T)1) << y); return x &= ~((T)1 << y);
} }
template <typename T> template<typename T> static inline T TOGGLEBIT(T& x, int y)
static inline T TOGGLEBIT(T& x, int y)
{ {
return x ^= (((T)1) << y); return x ^= (T)1 << y;
} }