summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2011-10-21 19:10:35 +0000
committerfrosch <frosch@openttd.org>2011-10-21 19:10:35 +0000
commit3eddb9c23fcc4aac9fc32bd6e923eada4bdcd9e5 (patch)
treeaa9b65f4e4035f8bea81c287d2f109143598692b /src
parent3e5a75839015c86400736b6047859e1023b37b96 (diff)
downloadopenttd-3eddb9c23fcc4aac9fc32bd6e923eada4bdcd9e5.tar.xz
(svn r23049) -Fix [FS#4810]: Use the same forest-check for the vegetation-map colour as for nearby station names.
Diffstat (limited to 'src')
-rw-r--r--src/industry.h2
-rw-r--r--src/industry_cmd.cpp24
-rw-r--r--src/smallmap_gui.cpp2
-rw-r--r--src/station_cmd.cpp25
4 files changed, 28 insertions, 25 deletions
diff --git a/src/industry.h b/src/industry.h
index d11b86443..b31bbd01e 100644
--- a/src/industry.h
+++ b/src/industry.h
@@ -138,6 +138,8 @@ void PlantRandomFarmField(const Industry *i);
void ReleaseDisastersTargetingIndustry(IndustryID);
+bool IsTileForestIndustry(TileIndex tile);
+
#define FOR_ALL_INDUSTRIES_FROM(var, start) FOR_ALL_ITEMS_FROM(Industry, industry_index, var, start)
#define FOR_ALL_INDUSTRIES(var) FOR_ALL_INDUSTRIES_FROM(var, 0)
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index ed9d2bfbc..f60b6f1cd 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -911,6 +911,30 @@ static void ChangeTileOwner_Industry(TileIndex tile, Owner old_owner, Owner new_
if (i->founder == old_owner) i->founder = (new_owner == INVALID_OWNER) ? OWNER_NONE : new_owner;
}
+/**
+ * Check whether the tile is a forest.
+ * @param tile the tile to investigate.
+ * @return true if and only if the tile is a forest
+ */
+bool IsTileForestIndustry(TileIndex tile)
+{
+ /* Check for industry tile */
+ if (!IsTileType(tile, MP_INDUSTRY)) return false;
+
+ const Industry *ind = Industry::GetByTile(tile);
+
+ /* Check for organic industry (i.e. not processing or extractive) */
+ if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_ORGANIC) == 0) return false;
+
+ /* Check for wood production */
+ for (uint i = 0; i < lengthof(ind->produced_cargo); i++) {
+ /* The industry produces wood. */
+ if (ind->produced_cargo[i] != CT_INVALID && CargoSpec::Get(ind->produced_cargo[i])->label == 'WOOD') return true;
+ }
+
+ return false;
+}
+
static const byte _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6};
static bool IsBadFarmFieldTile(TileIndex tile)
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 7989c5daa..871fff252 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -532,7 +532,7 @@ static inline uint32 GetSmallMapVegetationPixels(TileIndex tile, TileType t)
return (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) < 3) ? MKCOLOUR_XXXX(PC_BARE_LAND) : _vegetation_clear_bits[GetClearGround(tile)];
case MP_INDUSTRY:
- return GetIndustrySpec(Industry::GetByTile(tile)->type)->check_proc == CHECK_FOREST ? MKCOLOUR_XXXX(PC_GREEN) : MKCOLOUR_XXXX(PC_DARK_RED);
+ return IsTileForestIndustry(tile) ? MKCOLOUR_XXXX(PC_GREEN) : MKCOLOUR_XXXX(PC_DARK_RED);
case MP_TREES:
if (GetTreeGround(tile) == TREE_GROUND_SNOW_DESERT || GetTreeGround(tile) == TREE_GROUND_ROUGH_SNOW) {
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 18afebe7d..02d00238c 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -180,29 +180,6 @@ static bool CMSATree(TileIndex tile)
return IsTileType(tile, MP_TREES);
}
-/**
- * Check whether the tile is a forest.
- * @param tile the tile to investigate.
- * @return true if and only if the tile is a forest
- */
-static bool CMSAForest(TileIndex tile)
-{
- /* No industry */
- if (!IsTileType(tile, MP_INDUSTRY)) return false;
-
- const Industry *ind = Industry::GetByTile(tile);
-
- /* No extractive industry */
- if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_ORGANIC) == 0) return false;
-
- for (uint i = 0; i < lengthof(ind->produced_cargo); i++) {
- /* The industry produces wood. */
- if (ind->produced_cargo[i] != CT_INVALID && CargoSpec::Get(ind->produced_cargo[i])->label == 'WOOD') return true;
- }
-
- return false;
-}
-
#define M(x) ((x) - STR_SV_STNAME)
enum StationNaming {
@@ -322,7 +299,7 @@ static StringID GenerateStationName(Station *st, TileIndex tile, StationNaming n
/* Check woods */
if (HasBit(free_names, M(STR_SV_STNAME_WOODS)) && (
CountMapSquareAround(tile, CMSATree) >= 8 ||
- CountMapSquareAround(tile, CMSAForest) >= 2)
+ CountMapSquareAround(tile, IsTileForestIndustry) >= 2)
) {
return _settings_game.game_creation.landscape == LT_TROPIC ? STR_SV_STNAME_FOREST : STR_SV_STNAME_WOODS;
}