diff options
| author | peter1138 <peter1138@openttd.org> | 2007-01-14 19:57:49 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2007-01-14 19:57:49 +0000 |
| commit | 92d418b031d23cf42a4df09e12945cc4b737bce2 (patch) | |
| tree | c62990da208a45b3bd1c7379a1835190458d5a49 /src/macros.h | |
| parent | 19d31c7417e4c8ad763c6674b7d1c6f9022e3703 (diff) | |
| download | openttd-92d418b031d23cf42a4df09e12945cc4b737bce2.tar.xz | |
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
This lets us increase the sprite width from 14 to up to 29 bits,
effectively nulling the old sprite limit. Table changes in next commit.
Diffstat (limited to 'src/macros.h')
| -rw-r--r-- | src/macros.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/macros.h b/src/macros.h index a66220154..cd644b579 100644 --- a/src/macros.h +++ b/src/macros.h @@ -79,9 +79,8 @@ static inline int64 BIGMULS(int32 a, int32 b) { #define SETBITS(x,y) ((x) |= (y)) #define CLRBITS(x,y) ((x) &= ~(y)) -#define GENERAL_SPRITE_COLOR(color) ( ((color) + PALETTE_RECOLOR_START) << PALETTE_SPRITE_START) -#define PLAYER_SPRITE_COLOR(owner) ( GENERAL_SPRITE_COLOR(_player_colors[owner])) -#define SPRITE_PALETTE(x) ((x) | PALETTE_MODIFIER_COLOR) +#define GENERAL_SPRITE_COLOR(color) ((color) + PALETTE_RECOLOR_START) +#define PLAYER_SPRITE_COLOR(owner) (GENERAL_SPRITE_COLOR(_player_colors[owner])) extern const byte _ffb_64[128]; /* Returns the position of the first bit that is not zero, counted from the |