Changeset - r14473:12cc27fac236
[Not reviewed]
master
0 1 0
alberth - 15 years ago 2010-02-07 11:58:35
alberth@openttd.org
(svn r19052) -Codechange: Remove the _smallmap_draw_procs array.
1 file changed with 27 insertions and 28 deletions:
0 comments (0 inline, 0 general)
src/smallmap_gui.cpp
Show inline comments
 
@@ -251,20 +251,12 @@ static const AndOr _smallmap_vehicles_an
 
	{MKCOLOUR(0xB5B5B5B5), MKCOLOUR(0x00000000)}, // MP_INDUSTRY
 
	{MKCOLOUR(0x00000000), MKCOLOUR(0xFFFFFFFF)}, // MP_TUNNELBRIDGE
 
	{MKCOLOUR(0x00B5B500), MKCOLOUR(0xFF0000FF)}, // MP_UNMOVABLE
 
	{MKCOLOUR(0x00D7D700), MKCOLOUR(0xFF0000FF)},
 
};
 

	
 
/**
 
 * Function signature of the function to retrieve the colour data of a tile for display at the smallmap.
 
 * @param tile Tile that gets displayed.
 
 * @param t    Effective tile type of the tile (see #GetEffectiveTileType).
 
 * @return Colour data to display.
 
 */
 
typedef uint32 GetSmallMapPixels(TileIndex tile, TileType t);
 

	
 
/** Mapping of tile type to importance of the tile (higher number means more interesting to show). */
 
static const byte _tiletype_importance[] = {
 
	2, // MP_CLEAR
 
	8, // MP_RAILWAY
 
	7, // MP_ROAD
 
	5, // MP_HOUSE
 
@@ -427,24 +419,12 @@ static inline uint32 GetSmallMapOwnerPix
 
		 */
 
	}
 

	
 
	return _owner_colours[o];
 
}
 

	
 
/* Each tile has 4 x pixels and 1 y pixel */
 

	
 
/** Holds function pointers to determine tile colour in the smallmap for each smallmap mode. */
 
static GetSmallMapPixels * const _smallmap_draw_procs[] = {
 
	GetSmallMapContoursPixels,
 
	GetSmallMapVehiclesPixels,
 
	GetSmallMapIndustriesPixels,
 
	GetSmallMapRoutesPixels,
 
	GetSmallMapVegetationPixels,
 
	GetSmallMapOwnerPixels,
 
};
 

	
 
/** Vehicle colours in #SMT_VEHICLES mode. Indexed by #VehicleTypeByte. */
 
static const byte _vehicle_type_colours[6] = {
 
	184, 191, 152, 15, 215, 184
 
};
 

	
 

	
 
@@ -581,17 +561,16 @@ class SmallMapWindow : public Window {
 
			this->SetDirty();
 
		}
 
	}
 

	
 
	/**
 
	 * Decide which colours to show to the user for a group of tiles.
 
	 * @param ta   Tile area to investigate.
 
	 * @param proc Pointer to the colour function.
 
	 * @param ta Tile area to investigate.
 
	 * @return Colours to display.
 
	 */
 
	inline uint32 GetTileColours(const TileArea &ta, GetSmallMapPixels *proc) const
 
	inline uint32 GetTileColours(const TileArea &ta) const
 
	{
 
		int importance = 0;
 
		TileIndex tile = INVALID_TILE; // Position of the most important tile.
 
		TileType et = MP_VOID;         // Effective tile type at that position.
 

	
 
		TILE_AREA_LOOP(ti, ta) {
 
@@ -599,13 +578,34 @@ class SmallMapWindow : public Window {
 
			if (_tiletype_importance[ttype] > importance) {
 
				importance = _tiletype_importance[ttype];
 
				tile = ti;
 
				et = ttype;
 
			}
 
		}
 
		return proc(tile, et);
 

	
 
		switch (this->map_type) {
 
			case SMT_CONTOUR:
 
				return GetSmallMapContoursPixels(tile, et);
 

	
 
			case SMT_VEHICLES:
 
				return GetSmallMapVehiclesPixels(tile, et);
 

	
 
			case SMT_INDUSTRY:
 
				return GetSmallMapIndustriesPixels(tile, et);
 

	
 
			case SMT_ROUTES:
 
				return GetSmallMapRoutesPixels(tile, et);
 

	
 
			case SMT_VEGETATION:
 
				return GetSmallMapVegetationPixels(tile, et);
 

	
 
			case SMT_OWNER:
 
				return GetSmallMapOwnerPixels(tile, et);
 

	
 
			default: NOT_REACHED();
 
		}
 
	}
 

	
 
	/**
 
	 * Draws one column of tiles of the small map in a certain mode onto the screen buffer, skipping the shifted rows in between.
 
	 *
 
	 * @param dst Pointer to a part of the screen buffer to write to.
 
@@ -613,17 +613,16 @@ class SmallMapWindow : public Window {
 
	 * @param yc The Y coordinate of the first tile in the column
 
	 * @param pitch Number of pixels to advance in the screen buffer each time a pixel is written.
 
	 * @param reps Number of lines to draw
 
	 * @param start_pos Position of first pixel to draw.
 
	 * @param end_pos Position of last pixel to draw (exclusive).
 
	 * @param blitter current blitter
 
	 * @param proc Pointer to the colour function
 
	 * @note If pixel position is below \c 0, skip drawing.
 
	 * @see GetSmallMapPixels(TileIndex)
 
	 */
 
	void DrawSmallMapColumn(void *dst, uint xc, uint yc, int pitch, int reps, int start_pos, int end_pos, Blitter *blitter, GetSmallMapPixels *proc) const
 
	void DrawSmallMapColumn(void *dst, uint xc, uint yc, int pitch, int reps, int start_pos, int end_pos, Blitter *blitter) const
 
	{
 
		void *dst_ptr_abs_end = blitter->MoveTo(_screen.dst_ptr, 0, _screen.height);
 
		uint min_xy = _settings_game.construction.freeform_edges ? 1 : 0;
 

	
 
		do {
 
			/* Check if the tile (xc,yc) is within the map range */
 
@@ -641,13 +640,13 @@ class SmallMapWindow : public Window {
 
				ta = TileArea(TileXY(max(min_xy, xc), max(min_xy, yc)), this->zoom - (xc == 0), this->zoom - (yc == 0));
 
			} else {
 
				ta = TileArea(TileXY(xc, yc), this->zoom, this->zoom);
 
			}
 
			ta.ClampToMap(); // Clamp to map boundaries (may contain MP_VOID tiles!).
 

	
 
			uint32 val = this->GetTileColours(ta, proc);
 
			uint32 val = this->GetTileColours(ta);
 
			uint8 *val8 = (uint8 *)&val;
 
			int idx = max(0, -start_pos);
 
			for (int pos = max(0, start_pos); pos < end_pos; pos++) {
 
				blitter->SetPixel(dst, idx, 0, val8[idx]);
 
				idx++;
 
			}
 
@@ -820,13 +819,13 @@ class SmallMapWindow : public Window {
 
			if (x >= -3) {
 
				if (x >= dpi->width) break; // Exit the loop.
 

	
 
				int end_pos = min(dpi->width, x + 4);
 
				int reps = (dpi->height - y + 1) / 2; // Number of lines.
 
				if (reps > 0) {
 
					this->DrawSmallMapColumn(ptr, tile_x, tile_y, dpi->pitch * 2, reps, x, end_pos, blitter, _smallmap_draw_procs[this->map_type]);
 
					this->DrawSmallMapColumn(ptr, tile_x, tile_y, dpi->pitch * 2, reps, x, end_pos, blitter);
 
				}
 
			}
 

	
 
			if (y == 0) {
 
				tile_y += this->zoom;
 
				y++;
0 comments (0 inline, 0 general)