mirror of https://github.com/OpenTTD/OpenTTD.git
(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.
This commit is contained in:
parent
f80bf7fa68
commit
7f1cda519c
|
@ -231,11 +231,7 @@ static const uint16 * const _legend_table[] = {
|
|||
# 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] = {
|
||||
|
|
14
stdafx.h
14
stdafx.h
|
@ -205,21 +205,23 @@ typedef unsigned char byte;
|
|||
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)
|
||||
|
|
Loading…
Reference in New Issue