Changeset - r13550:f80204e42c04
[Not reviewed]
master
0 1 0
rubidium - 15 years ago 2009-11-14 20:34:46
rubidium@openttd.org
(svn r18082) -Codechange: make it visually easier to see where the different legenda 'tables' are split + some typos
1 file changed with 5 insertions and 4 deletions:
0 comments (0 inline, 0 general)
src/smallmap_gui.cpp
Show inline comments
 
@@ -147,18 +147,18 @@ static int _smallmap_industry_count; ///
 
/** Macro for break marker in arrays of LegendAndColour.
 
 * It will have valid data, though */
 
#define MS(a, b) {a, b, INVALID_INDUSTRYTYPE, true, false, true}
 

	
 
/** Structure for holding relevant data for legends in small map */
 
struct LegendAndColour {
 
	uint16 colour;     ///< colour of the item on the map
 
	uint8 colour;      ///< colour of the item on the map
 
	StringID legend;   ///< string corresponding to the coloured item
 
	IndustryType type; ///< type of industry
 
	bool show_on_map;  ///< for filtering industries, if true is shown on map in colour
 
	bool end;          ///< this is the end of the list
 
	bool col_break;    ///< perform a break and go one collumn further
 
	bool col_break;    ///< perform a break and go one column further
 
};
 

	
 
/** Legend text giving the colours to look for on the minimap */
 
static const LegendAndColour _legend_land_contours[] = {
 
	MK(0x5A, STR_SMALLMAP_LEGENDA_100M),
 
	MK(0x5C, STR_SMALLMAP_LEGENDA_200M),
 
@@ -176,23 +176,24 @@ static const LegendAndColour _legend_lan
 

	
 
static const LegendAndColour _legend_vehicles[] = {
 
	MK(0xB8, STR_SMALLMAP_LEGENDA_TRAINS),
 
	MK(0xBF, STR_SMALLMAP_LEGENDA_ROAD_VEHICLES),
 
	MK(0x98, STR_SMALLMAP_LEGENDA_SHIPS),
 
	MK(0x0F, STR_SMALLMAP_LEGENDA_AIRCRAFT),
 

	
 
	MS(0xD7, STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES),
 
	MK(0xB5, STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES),
 
	MKEND()
 
};
 

	
 
static const LegendAndColour _legend_routes[] = {
 
	MK(0xD7, STR_SMALLMAP_LEGENDA_ROADS),
 
	MK(0x0A, STR_SMALLMAP_LEGENDA_RAILROADS),
 
	MK(0xB5, STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES),
 

	
 
	MS(0x56, STR_SMALLMAP_LEGENDA_RAILROAD_STATION),
 

	
 
	MK(0xC2, STR_SMALLMAP_LEGENDA_TRUCK_LOADING_BAY),
 
	MK(0xBF, STR_SMALLMAP_LEGENDA_BUS_STATION),
 
	MK(0xB8, STR_SMALLMAP_LEGENDA_AIRPORT_HELIPORT),
 
	MK(0x98, STR_SMALLMAP_LEGENDA_DOCK),
 
	MKEND()
 
};
 
@@ -201,14 +202,14 @@ static const LegendAndColour _legend_veg
 
	MK(0x52, STR_SMALLMAP_LEGENDA_ROUGH_LAND),
 
	MK(0x54, STR_SMALLMAP_LEGENDA_GRASS_LAND),
 
	MK(0x37, STR_SMALLMAP_LEGENDA_BARE_LAND),
 
	MK(0x25, STR_SMALLMAP_LEGENDA_FIELDS),
 
	MK(0x57, STR_SMALLMAP_LEGENDA_TREES),
 
	MK(0xD0, STR_SMALLMAP_LEGENDA_FOREST),
 

	
 
	MS(0x0A, STR_SMALLMAP_LEGENDA_ROCKS),
 

	
 
	MK(0xC2, STR_SMALLMAP_LEGENDA_DESERT),
 
	MK(0x98, STR_SMALLMAP_LEGENDA_SNOW),
 
	MK(0xD7, STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES),
 
	MK(0xB5, STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES),
 
	MKEND()
 
};
0 comments (0 inline, 0 general)