Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(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.

Browse Source
This commit is contained in:
Darkvater 2006-02-05 23:12:23 +00:00
parent 2dd0473e0a
commit d9d4a4c4bd
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
smallmap_gui.c
View File

@ -231,11 +231,7 @@ static const uint16 * const _legend_table[] = {
# define WRITE_PIXELS_OR(dst,val) *(uint32*)(dst) |= (val); # define WRITE_PIXELS_OR(dst,val) *(uint32*)(dst) |= (val);
#endif #endif
#if defined(TTD_BIG_ENDIAN) #define MKCOLOR(x) TO_LE32X(x)
# define MKCOLOR(x) BSWAP32(x)
#elif defined(TTD_LITTLE_ENDIAN)
# define MKCOLOR(x) (x)
#endif
/* Height encodings; 16 levels XXX - needs updating for more/finer heights! */ /* Height encodings; 16 levels XXX - needs updating for more/finer heights! */
static const uint32 _map_height_bits[16] = { static const uint32 _map_height_bits[16] = {

14
stdafx.h
View File

@ -205,21 +205,23 @@ typedef unsigned char byte;
static inline uint16 TO_LE16(uint16 x) { return BSWAP16(x); } static inline uint16 TO_LE16(uint16 x) { return BSWAP16(x); }
static inline uint32 FROM_LE32(uint32 x) { return BSWAP32(x); } static inline uint32 FROM_LE32(uint32 x) { return BSWAP32(x); }
static inline uint16 FROM_LE16(uint16 x) { return BSWAP16(x); } static inline uint16 FROM_LE16(uint16 x) { return BSWAP16(x); }
# define TO_BE32(x) (x) # define TO_BE32(x) (x)
# define TO_BE16(x) (x) # define TO_BE16(x) (x)
# define FROM_BE32(x) (x) # define FROM_BE32(x) (x)
# define FROM_BE16(x) (x) # define FROM_BE16(x) (x)
# define TO_BE32X(x) (x) # define TO_LE32X(x) BSWAP32(x)
# define TO_BE32X(x) (x)
#else #else
static inline uint32 TO_BE32(uint32 x) { return BSWAP32(x); } static inline uint32 TO_BE32(uint32 x) { return BSWAP32(x); }
static inline uint16 TO_BE16(uint16 x) { return BSWAP16(x); } static inline uint16 TO_BE16(uint16 x) { return BSWAP16(x); }
static inline uint32 FROM_BE32(uint32 x) { return BSWAP32(x); } static inline uint32 FROM_BE32(uint32 x) { return BSWAP32(x); }
static inline uint16 FROM_BE16(uint16 x) { return BSWAP16(x); } static inline uint16 FROM_BE16(uint16 x) { return BSWAP16(x); }
# define TO_LE32(x) (x) # define TO_LE32(x) (x)
# define TO_LE16(x) (x) # define TO_LE16(x) (x)
# define TO_BE32X(x) BSWAP32(x)
# define FROM_LE32(x) (x) # define FROM_LE32(x) (x)
# define FROM_LE16(x) (x) # define FROM_LE16(x) (x)
# define TO_LE32X(x) (x)
# define TO_BE32X(x) BSWAP32(x)
#endif /* TTD_BIG_ENDIAN */ #endif /* TTD_BIG_ENDIAN */
#if !defined(GAME_DATA_DIR) #if !defined(GAME_DATA_DIR)