mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r19046) -Codechange: Move retrieval of tile colour data in smallmap.

This commit is contained in:
alberth 2010-02-06 19:18:09 +00:00
parent 9734124835
commit 5cd81526d8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/smallmap_gui.cpp
View File

@ -586,14 +586,15 @@ class SmallMapWindow : public Window {
} }
/** /**
* Decide which tile to show to the user from a group of tiles. * Decide which colours to show to the user for a group of tiles.
* @param ta Tile area to investigate. * @param ta Tile area to investigate.
* @return Most interesting tile. May be #INVALID_TILE if off-map. * @param proc Pointer to the colour function.
* @return Colours to display.
*/ */
inline TileIndex GetMostImportantTileFromGroup(const TileArea &ta) const inline uint32 GetTileColours(const TileArea &ta, GetSmallMapPixels *proc) const
{ {
int importance = 0; int importance = 0;
TileIndex tile = INVALID_TILE; TileIndex tile = INVALID_TILE; // Position of the most important tile.
TILE_AREA_LOOP(ti, ta) { TILE_AREA_LOOP(ti, ta) {
TileType ttype = GetEffectiveTileType(ti); TileType ttype = GetEffectiveTileType(ti);
@ -602,7 +603,7 @@ class SmallMapWindow : public Window {
tile = ti; tile = ti;
} }
} }
return tile; return proc(tile);
} }
/** /**
@ -644,7 +645,7 @@ class SmallMapWindow : public Window {
} }
ta.ClampToMap(); // Clamp to map boundaries (may contain MP_VOID tiles!). ta.ClampToMap(); // Clamp to map boundaries (may contain MP_VOID tiles!).
uint32 val = proc(this->GetMostImportantTileFromGroup(ta)); uint32 val = this->GetTileColours(ta, proc);
uint8 *val8 = (uint8 *)&val; uint8 *val8 = (uint8 *)&val;
int idx = max(0, -start_pos); int idx = max(0, -start_pos);
for (int pos = max(0, start_pos); pos < end_pos; pos++) { for (int pos = max(0, start_pos); pos < end_pos; pos++) {