Mercurial > hg > openttd
changeset 4455:9ccf301ed63b draft
(svn r6238) Use the colour stored in _colour_gradient[] instead of explicitly retrieving it with GetNonSprite()
| author | tron <tron@openttd.org> |
|---|---|
| date | Wed, 30 Aug 2006 14:30:26 +0000 |
| parents | 4fa7e6ad1251 |
| children | 374f1bfde037 |
| files | smallmap_gui.c |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/smallmap_gui.c +++ b/smallmap_gui.c @@ -6,7 +6,6 @@ #include "bridge_map.h" #include "clear_map.h" #include "industry_map.h" -#include "spritecache.h" #include "station_map.h" #include "table/strings.h" #include "table/sprites.h" @@ -558,9 +557,6 @@ 184, 191, 152, 15, 215, 184 }; -static inline uint32 dup_byte32(byte b) { - return b + (b << 8) + (b << 16) + (b << 24); -} static void DrawVertMapIndicator(int x, int y, int x2, int y2) { @@ -617,7 +613,7 @@ FOR_ALL_PLAYERS(p) { if (p->is_active) { _owner_colors[p->index] = - dup_byte32(GetNonSprite(PALETTE_RECOLOR_START + p->player_color)[0xCB]); // XXX - magic pixel + _colour_gradient[p->player_color][5] * 0x01010101; } } }