diff options
| author | tron <tron@openttd.org> | 2005-08-27 13:04:15 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-08-27 13:04:15 +0000 |
| commit | 1677748d4d0d835342ec0d003d2b349d1db5a779 (patch) | |
| tree | d2b6b8bd7b1365cfa9b0db9e728bd0264a057ef9 /smallmap_gui.c | |
| parent | ffdefbdee21c0740bbfb15be55a34d229f59e60a (diff) | |
| download | openttd-1677748d4d0d835342ec0d003d2b349d1db5a779.tar.xz | |
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
Diffstat (limited to 'smallmap_gui.c')
| -rw-r--r-- | smallmap_gui.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/smallmap_gui.c b/smallmap_gui.c index e9cebcb62..232bfb493 100644 --- a/smallmap_gui.c +++ b/smallmap_gui.c @@ -516,17 +516,15 @@ static uint32 _owner_colors[256]; */ static inline uint32 GetSmallMapOwnerPixels(TileIndex tile) { - TileType t = GetTileType(tile); + Owner o; - if (t == MP_INDUSTRY) { - t = 0xff; - } else if (t == MP_HOUSE || IsTileOwner(tile, OWNER_TOWN)) { - t = 0x80; - } else { - t = GetTileOwner(tile); + switch (GetTileType(tile)) { + case MP_INDUSTRY: o = OWNER_SPECTATOR; break; + case MP_HOUSE: o = OWNER_TOWN; break; + default: o = GetTileOwner(tile); break; } - return _owner_colors[t]; + return _owner_colors[o]; } @@ -604,12 +602,10 @@ static void DrawSmallMap(DrawPixelInfo *dpi, Window *w, int type, bool show_town /* setup owner table */ if (type == 5) { - Player *p; - - /* clear the town colors */ - memset(&_owner_colors[128], 0xB4, 128 * sizeof(*_owner_colors)); + const Player* p; /* fill with some special colors */ + _owner_colors[OWNER_TOWN] = MKCOLOR(0xB4B4B4B4); _owner_colors[OWNER_NONE] = MKCOLOR(0x54545454); _owner_colors[OWNER_WATER] = MKCOLOR(0xCACACACA); _owner_colors[OWNER_SPECTATOR] = MKCOLOR(0x20202020); /* industry */ |