dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r6238) Use the colour stored in _colour_gradient[] instead of explicitly retrieving it with GetNonSprite()

Browse Source
This commit is contained in:
tron
2006-08-30 14:30:26 +00:00
parent b9f47dda4e
commit 747f9cf80a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
smallmap_gui.c
View File

@@ -6,7 +6,6 @@
#include "bridge_map.h" #include "bridge_map.h"
#include "clear_map.h" #include "clear_map.h"
#include "industry_map.h" #include "industry_map.h"
#include "spritecache.h"
#include "station_map.h" #include "station_map.h"
#include "table/strings.h" #include "table/strings.h"
#include "table/sprites.h" #include "table/sprites.h"
@@ -558,9 +557,6 @@ static const byte _vehicle_type_colors[6] = {
184, 191, 152, 15, 215, 184 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) static void DrawVertMapIndicator(int x, int y, int x2, int y2)
{ {
@@ -617,7 +613,7 @@ static void DrawSmallMap(DrawPixelInfo *dpi, Window *w, int type, bool show_town
FOR_ALL_PLAYERS(p) { FOR_ALL_PLAYERS(p) {
if (p->is_active) { if (p->is_active) {
_owner_colors[p->index] = _owner_colors[p->index] =
dup_byte32(GetNonSprite(PALETTE_RECOLOR_START + p->player_color)[0xCB]); // XXX - magic pixel _colour_gradient[p->player_color][5] * 0x01010101;
} }
} }
} }