Mercurial > hg > openttd
changeset 2984:3d100bebac86 draft
(svn r3559) - CodeChange: simplify MKCOLOR(x) macro for smallmap_gui.c by adding a TO_LE32X() macro next to TO_BE32X(). The 'X' signifies them as macros and not-inline functions so they can be used in variable declarations.
| author | Darkvater <Darkvater@openttd.org> |
|---|---|
| date | Sun, 05 Feb 2006 23:12:23 +0000 |
| parents | 2ee69018dd2b |
| children | 448dc4355596 |
| files | smallmap_gui.c stdafx.h |
| diffstat | 2 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/smallmap_gui.c +++ b/smallmap_gui.c @@ -231,11 +231,7 @@ # define WRITE_PIXELS_OR(dst,val) *(uint32*)(dst) |= (val); #endif -#if defined(TTD_BIG_ENDIAN) -# define MKCOLOR(x) BSWAP32(x) -#elif defined(TTD_LITTLE_ENDIAN) -# define MKCOLOR(x) (x) -#endif +#define MKCOLOR(x) TO_LE32X(x) /* Height encodings; 16 levels XXX - needs updating for more/finer heights! */ static const uint32 _map_height_bits[16] = {
--- a/stdafx.h +++ b/stdafx.h @@ -205,21 +205,23 @@ static inline uint16 TO_LE16(uint16 x) { return BSWAP16(x); } static inline uint32 FROM_LE32(uint32 x) { return BSWAP32(x); } static inline uint16 FROM_LE16(uint16 x) { return BSWAP16(x); } -# define TO_BE32(x) (x) -# define TO_BE16(x) (x) +# define TO_BE32(x) (x) +# define TO_BE16(x) (x) # define FROM_BE32(x) (x) # define FROM_BE16(x) (x) -# define TO_BE32X(x) (x) +# define TO_LE32X(x) BSWAP32(x) +# define TO_BE32X(x) (x) #else static inline uint32 TO_BE32(uint32 x) { return BSWAP32(x); } static inline uint16 TO_BE16(uint16 x) { return BSWAP16(x); } static inline uint32 FROM_BE32(uint32 x) { return BSWAP32(x); } static inline uint16 FROM_BE16(uint16 x) { return BSWAP16(x); } -# define TO_LE32(x) (x) -# define TO_LE16(x) (x) -# define TO_BE32X(x) BSWAP32(x) +# define TO_LE32(x) (x) +# define TO_LE16(x) (x) # define FROM_LE32(x) (x) # define FROM_LE16(x) (x) +# define TO_LE32X(x) (x) +# define TO_BE32X(x) BSWAP32(x) #endif /* TTD_BIG_ENDIAN */ #if !defined(GAME_DATA_DIR)