summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorterkhen <terkhen@openttd.org>2011-02-22 14:23:38 +0000
committerterkhen <terkhen@openttd.org>2011-02-22 14:23:38 +0000
commit4860eff98c5201877188cddd34aea395b2ba2072 (patch)
treeb8ec11ea963e453254eaf6c58c2622ebdef391b5 /src
parentf719bc7b3c7b1e812103cef3320bda5e1ccf863c (diff)
downloadopenttd-4860eff98c5201877188cddd34aea395b2ba2072.tar.xz
(svn r22127) -Fix: Canals would get drawn as land in the smallmap when using the owner window.
Diffstat (limited to 'src')
-rw-r--r--src/smallmap_gui.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 7cc9f540f..b7bcd9c20 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -542,11 +542,10 @@ static inline uint32 GetSmallMapOwnerPixels(TileIndex tile, TileType t)
*/
}
- if ((o < MAX_COMPANIES && !_legend_land_owners[_company_to_list_pos[o]].show_on_map) || o == OWNER_NONE) {
+ if ((o < MAX_COMPANIES && !_legend_land_owners[_company_to_list_pos[o]].show_on_map) || o == OWNER_NONE || o == OWNER_WATER) {
+ if (t == MP_WATER) return MKCOLOUR(0xCACACACA);
const SmallMapColourScheme *cs = &_heightmap_schemes[_settings_client.gui.smallmap_land_colour];
return _smallmap_show_heightmap ? cs->height_colours[TileHeight(tile)] : cs->default_colour;
- } else if (o == OWNER_WATER) {
- return MKCOLOUR(0xCACACACA);
} else if (o == OWNER_TOWN) {
return MKCOLOUR(0xB4B4B4B4);
}