cpp/openttd-patchpack/source Changeset - r12816:33099b7286d4

Changeset - r12816:33099b7286d4

Parent rev.

Child rev.

[Not reviewed]

master

0 14 0

smatz - 15 years ago 2009-08-30 11:47:41
smatz@openttd.org

(svn r17316) -Codechange: use Industry::GetByTile() instead of GetIndustryByTile()

14 files changed with 52 insertions and 55 deletions:

src/ai/api/ai_tilelist.cpp

src/disaster_cmd.cpp

src/economy.cpp

src/effectvehicle.cpp

src/industry.h

src/industry_cmd.cpp

src/industry_map.h

src/newgrf_industries.cpp

src/newgrf_industrytiles.cpp

src/saveload/afterload.cpp

src/smallmap_gui.cpp

src/station.cpp

src/station_cmd.cpp

src/water_cmd.cpp

0 comments (0 inline, 0 general)

src/ai/api/ai_tilelist.cpp

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 /** @file ai_tilelist.cpp Implementation of AITileList and friends. */
 #include "ai_tilelist.hpp"
 #include "ai_industry.hpp"
 #include "../../tile_map.h"
-#include "../../industry_map.h"
+#include "../../industry.h"
 #include "../../station_base.h"
 #include "../../settings_type.h"
 void AITileList::FixRectangleSpan(TileIndex &t1, TileIndex &t2)
+{
 	uint x1 = ::TileX(t1);

src/disaster_cmd.cpp

➞

Show inline comments

@@ @@ -23,13 +23,13 @@ @@
  */
 #include "stdafx.h"
 #include "landscape.h"
-#include "industry_map.h"
+#include "industry.h"
 #include "station_base.h"
 #include "command_func.h"
 #include "news_func.h"
 #include "town.h"
 #include "company_func.h"
 #include "variables.h"

src/economy.cpp

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "tile_cmd.h"
 #include "company_func.h"
 #include "command_func.h"
-#include "industry_map.h"
+#include "industry.h"
 #include "town.h"
 #include "news_func.h"
 #include "network/network.h"
 #include "network/network_func.h"
 #include "vehicle_gui.h"
 #include "ai/ai.hpp"

src/effectvehicle.cpp

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
  */
 /** @file effectvehicle.cpp Implementation of everything generic to vehicles. */
 #include "stdafx.h"
 #include "landscape.h"
-#include "industry_map.h"
+#include "industry.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "animated_tile_func.h"
 #include "effectvehicle_base.h"
 #include "effectvehicle_func.h"

src/industry.h

➞

Show inline comments

@@ @@ -16,17 +16,15 @@ @@
 #include "core/random_func.hpp"
 #include "newgrf_storage.h"
 #include "cargo_type.h"
 #include "economy_type.h"
 #include "map_type.h"
 #include "industry_type.h"
 #include "industrytype.h"
 #include "tile_type.h"
 #include "subsidy_type.h"
 #include "town_type.h"
 #include "date_type.h"
 #include "industry_map.h"
 typedef Pool<Industry, IndustryID, 64, 64000> IndustryPool;
 extern IndustryPool _industry_pool;
 /**
@@ @@ -71,12 +69,23 @@ struct Industry : IndustryPool::PoolItem @@
 	PersistentStorage psa;              ///< Persistent storage for NewGRF industries.
 	Industry(TileIndex tile = INVALID_TILE) : xy(tile) {}
 	~Industry();
 	/**
 	 * Get the industry of the given tile
 	 * @param t the tile to get the industry from
 	 * @pre IsTileType(t, MP_INDUSTRY)
 	 * @return the industry
 	 */
 	static FORCEINLINE Industry *GetByTile(TileIndex tile)
+	{
 		return Industry::Get(GetIndustryIndex(tile));
+	}
 	static Industry *GetRandom();
 };
 void PlantRandomFarmField(const Industry *i);
 void ReleaseDisastersTargetingIndustry(IndustryID);

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 /** @file industry_cmd.cpp Handling of industry tiles. */
 #include "stdafx.h"
 #include "openttd.h"
 #include "clear_map.h"
-#include "industry_map.h"
+#include "industry.h"
 #include "station_base.h"
 #include "train.h"
 #include "landscape.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "town.h"
@@ @@ -99,13 +99,13 @@ void ResetIndustryCreationProbility(Indu @@
  * @return general type for this industry, as defined in industry.h
  **/
 IndustryType GetIndustryType(TileIndex tile)
+{
 	assert(IsTileType(tile, MP_INDUSTRY));
-	const Industry *ind = GetIndustryByTile(tile);
+	const Industry *ind = Industry::GetByTile(tile);
 	assert(ind != NULL);
 	return ind->type;
+}
 /**
  * Accessor for array _industry_specs.
@@ @@ -294,13 +294,13 @@ static IndustryDrawTileProc * const _ind @@
 	IndustryDrawCoalPlantSparks,
 };
 static void DrawTile_Industry(TileInfo *ti)
+{
 	IndustryGfx gfx = GetIndustryGfx(ti->tile);
-	Industry *ind = GetIndustryByTile(ti->tile);
+	Industry *ind = Industry::GetByTile(ti->tile);
 	const IndustryTileSpec *indts = GetIndustryTileSpec(gfx);
 	const DrawBuildingsTileStruct *dits;
 	SpriteID image;
 	SpriteID pal;
 	/* Retrieve pointer to the draw industry tile struct */
@@ @@ -382,13 +382,13 @@ static Foundation GetFoundation_Industry @@
 	 * account for this, as other structures should
 	 * draw the wall of the foundation in this case.
 	 */
 	if (gfx >= NEW_INDUSTRYTILEOFFSET) {
 		const IndustryTileSpec *indts = GetIndustryTileSpec(gfx);
 		if (indts->grf_prop.spritegroup != NULL && HasBit(indts->callback_flags, CBM_INDT_DRAW_FOUNDATIONS)) {
-			uint32 callback_res = GetIndustryTileCallback(CBID_INDUSTRY_DRAW_FOUNDATIONS, 0, 0, gfx, GetIndustryByTile(tile), tile);
+			uint32 callback_res = GetIndustryTileCallback(CBID_INDUSTRY_DRAW_FOUNDATIONS, 0, 0, gfx, Industry::GetByTile(tile), tile);
 			if (callback_res == 0) return FOUNDATION_NONE;
+		}
+	}
 	return FlatteningFoundation(tileh);
+}
@@ @@ -403,21 +403,21 @@ static void AddAcceptedCargo_Industry(Ti @@
 	/* And then these will always point to a same sized array with the required data */
 	const CargoID *accepts_cargo = itspec->accepts_cargo;
 	const uint8 *cargo_acceptance = itspec->acceptance;
 	if (HasBit(itspec->callback_flags, CBM_INDT_ACCEPT_CARGO)) {
-		uint16 res = GetIndustryTileCallback(CBID_INDTILE_ACCEPT_CARGO, 0, 0, gfx, GetIndustryByTile(tile), tile);
+		uint16 res = GetIndustryTileCallback(CBID_INDTILE_ACCEPT_CARGO, 0, 0, gfx, Industry::GetByTile(tile), tile);
 		if (res != CALLBACK_FAILED) {
 			accepts_cargo = raw_accepts_cargo;
 			for (uint i = 0; i < lengthof(itspec->accepts_cargo); i++) raw_accepts_cargo[i] = GetCargoTranslation(GB(res, i * 5, 5), itspec->grf_prop.grffile);
+		}
+	}
 	if (HasBit(itspec->callback_flags, CBM_INDT_CARGO_ACCEPTANCE)) {
-		uint16 res = GetIndustryTileCallback(CBID_INDTILE_CARGO_ACCEPTANCE, 0, 0, gfx, GetIndustryByTile(tile), tile);
+		uint16 res = GetIndustryTileCallback(CBID_INDTILE_CARGO_ACCEPTANCE, 0, 0, gfx, Industry::GetByTile(tile), tile);
 		if (res != CALLBACK_FAILED) {
 			cargo_acceptance = raw_cargo_acceptance;
 			for (uint i = 0; i < lengthof(itspec->accepts_cargo); i++) raw_cargo_acceptance[i] = GB(res, i * 4, 4);
+		}
+	}
@@ @@ -426,13 +426,13 @@ static void AddAcceptedCargo_Industry(Ti @@
 		if (a != CT_INVALID) acceptance[a] += cargo_acceptance[i];
+	}
+}
 static void GetTileDesc_Industry(TileIndex tile, TileDesc *td)
+{
-	const Industry *i = GetIndustryByTile(tile);
+	const Industry *i = Industry::GetByTile(tile);
 	const IndustrySpec *is = GetIndustrySpec(i->type);
 	td->owner[0] = i->owner;
 	td->str = is->name;
 	if (!IsIndustryCompleted(tile)) {
 		SetDParamX(td->dparam, 0, td->str);
@@ @@ -443,13 +443,13 @@ static void GetTileDesc_Industry(TileInd @@
 		td->grf = GetGRFConfig(is->grf_prop.grffile->grfid)->name;
+	}
+}
 static CommandCost ClearTile_Industry(TileIndex tile, DoCommandFlag flags)
+{
-	Industry *i = GetIndustryByTile(tile);
+	Industry *i = Industry::GetByTile(tile);
 	const IndustrySpec *indspec = GetIndustrySpec(i->type);
 	/* water can destroy industries
 	 * in editor you can bulldoze industries
 	 * with magic_bulldozer cheat you can destroy industries
 	 * (area around OILRIG is water, so water shouldn't flood it
@@ @@ -470,13 +470,13 @@ static CommandCost ClearTile_Industry(Ti @@
+	}
 	return CommandCost(EXPENSES_CONSTRUCTION, indspec->GetRemovalCost());
+}
 static void TransportIndustryGoods(TileIndex tile)
+{
-	Industry *i = GetIndustryByTile(tile);
+	Industry *i = Industry::GetByTile(tile);
 	const IndustrySpec *indspec = GetIndustrySpec(i->type);
 	bool moved_cargo = false;
 	for (uint j = 0; j < lengthof(i->produced_cargo_waiting); j++) {
 		uint cw = min(i->produced_cargo_waiting[j], 255);
 		if (cw > indspec->minimal_cargo && i->produced_cargo[j] != CT_INVALID) {
@@ @@ -843,13 +843,13 @@ static void TileLoop_Industry(TileIndex @@
 	case GFX_COPPER_MINE_CHIMNEY:
 		CreateEffectVehicleAbove(TileX(tile) * TILE_SIZE + 6, TileY(tile) * TILE_SIZE + 6, 43, EV_SMOKE);
 		break;
 	case GFX_TOY_FACTORY: {
-			Industry *i = GetIndustryByTile(tile);
+			Industry *i = Industry::GetByTile(tile);
 			if (i->was_cargo_delivered) {
 				i->was_cargo_delivered = false;
 				SetIndustryAnimationLoop(tile, 0);
 				AddAnimatedTile(tile);
+			}
+		}
@@ @@ -879,24 +879,24 @@ static TrackStatus GetTileTrackStatus_In @@
+{
 	return 0;
+}
 static void AddProducedCargo_Industry(TileIndex tile, CargoArray &produced)
+{
-	const Industry *i = GetIndustryByTile(tile);
+	const Industry *i = Industry::GetByTile(tile);
 	for (uint j = 0; j < lengthof(i->produced_cargo); j++) {
 		CargoID cargo = i->produced_cargo[j];
 		if (cargo != CT_INVALID) produced[cargo]++;
+	}
+}
 static void ChangeTileOwner_Industry(TileIndex tile, Owner old_owner, Owner new_owner)
+{
 	/* If the founder merges, the industry was created by the merged company */
-	Industry *i = GetIndustryByTile(tile);
+	Industry *i = Industry::GetByTile(tile);
 	if (i->founder == old_owner) i->founder = (new_owner == INVALID_OWNER) ? OWNER_NONE : new_owner;
+}
 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)
@@ @@ -2406,13 +2406,13 @@ static CommandCost TerraformTile_Industr @@
 			const IndustryGfx gfx = GetIndustryGfx(tile);
 			const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx);
 			/* Call callback 3C 'disable autosloping for industry tiles'. */
 			if (HasBit(itspec->callback_flags, CBM_INDT_AUTOSLOPE)) {
 				/* If the callback fails, allow autoslope. */
-				uint16 res = GetIndustryTileCallback(CBID_INDUSTRY_AUTOSLOPE, 0, 0, gfx, GetIndustryByTile(tile), tile);
+				uint16 res = GetIndustryTileCallback(CBID_INDUSTRY_AUTOSLOPE, 0, 0, gfx, Industry::GetByTile(tile), tile);
 				if ((res == 0) || (res == CALLBACK_FAILED)) return CommandCost(EXPENSES_CONSTRUCTION, _price.terraform);
 			} else {
 				/* allow autoslope */
 				return CommandCost(EXPENSES_CONSTRUCTION, _price.terraform);
+			}
+		}

src/industry_map.h

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 /** @file industry_map.h Accessors for industries */
 #ifndef INDUSTRY_MAP_H
 #define INDUSTRY_MAP_H
-#include "industry.h"
+#include "industrytype.h"
 #include "tile_map.h"
 #include "water_map.h"
 /**
  * The following enums are indices used to know what to draw for this industry tile.
@@ @@ -67,23 +67,12 @@ static inline IndustryID GetIndustryInde @@
+{
 	assert(IsTileType(t, MP_INDUSTRY));
 	return _m[t].m2;
+}
 /**
  * Get the industry of the given tile
  * @param t the tile to get the industry from
  * @pre IsTileType(t, MP_INDUSTRY)
  * @return the industry
  */
 static inline Industry *GetIndustryByTile(TileIndex t)
+{
 	return Industry::Get(GetIndustryIndex(t));
+}
 /**
  * Is this industry tile fully built?
  * @param t the tile to analyze
  * @pre IsTileType(t, MP_INDUSTRY)
  * @return true if and only if the industry tile is fully built
  */
 static inline bool IsIndustryCompleted(TileIndex t)

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 #include "stdafx.h"
 #include "debug.h"
 #include "tile_type.h"
 #include "strings_type.h"
 #include "company_type.h"
-#include "industry_map.h"
+#include "industry.h"
 #include "newgrf.h"
 #include "newgrf_industries.h"
 #include "newgrf_commons.h"
 #include "newgrf_text.h"
 #include "newgrf_town.h"
 #include "window_func.h"
@@ @@ -239,21 +239,21 @@ uint32 IndustryGetVariable(const Resolve @@
 		/* Get industry ID at offset param */
 		case 0x60: return GetIndustryIDAtOffset(GetNearbyTile(parameter, industry->xy), industry);
 		/* Get random tile bits at offset param */
 		case 0x61:
 			tile = GetNearbyTile(parameter, tile);
-			return (IsTileType(tile, MP_INDUSTRY) && GetIndustryByTile(tile) == industry) ? GetIndustryRandomBits(tile) : 0;
+			return (IsTileType(tile, MP_INDUSTRY) && Industry::GetByTile(tile) == industry) ? GetIndustryRandomBits(tile) : 0;
 		/* Land info of nearby tiles */
 		case 0x62: return GetNearbyIndustryTileInformation(parameter, tile, INVALID_INDUSTRY);
 		/* Animation stage of nearby tiles */
 		case 0x63:
 			tile = GetNearbyTile(parameter, tile);
-			if (IsTileType(tile, MP_INDUSTRY) && GetIndustryByTile(tile) == industry) {
+			if (IsTileType(tile, MP_INDUSTRY) && Industry::GetByTile(tile) == industry) {
 				return GetIndustryAnimationState(tile);
+			}
 			return 0xFFFFFFFF;
 		/* Distance of nearest industry of given type */
 		case 0x64: return GetClosestIndustry(tile, MapNewGRFIndustryType(parameter, indspec->grf_prop.grffile->grfid), industry);

src/newgrf_industrytiles.cpp

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ @@
 #include "core/random_func.hpp"
 #include "newgrf_commons.h"
 #include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "newgrf_sound.h"
 #include "newgrf_text.h"
-#include "industry_map.h"
+#include "industry.h"
 #include "sprite.h"
 #include "transparency.h"
 #include "functions.h"
 #include "town.h"
 #include "command_func.h"
 #include "animated_tile_func.h"
@@ @@ -94,13 +94,13 @@ static uint32 IndustryTileGetVariable(co @@
 		/* Land info of nearby tiles */
 		case 0x60: return GetNearbyIndustryTileInformation(parameter, tile, inds == NULL ? (IndustryID)INVALID_INDUSTRY : inds->index);
 		/* Animation stage of nearby tiles */
 		case 0x61:
 			tile = GetNearbyTile(parameter, tile);
-			if (IsTileType(tile, MP_INDUSTRY) && GetIndustryByTile(tile) == inds) {
+			if (IsTileType(tile, MP_INDUSTRY) && Industry::GetByTile(tile) == inds) {
 				return GetIndustryAnimationState(tile);
+			}
 			return UINT_MAX;
 		/* Get industry tile ID at offset */
 		case 0x62: return GetIndustryIDAtOffset(GetNearbyTile(parameter, tile), inds);
@@ @@ -119,31 +119,31 @@ static const SpriteGroup *IndustryTileRe @@
+}
 static uint32 IndustryTileGetRandomBits(const ResolverObject *object)
+{
 	const TileIndex tile = object->u.industry.tile;
 	if (tile == INVALID_TILE || !IsTileType(tile, MP_INDUSTRY)) return 0;
-	return (object->scope == VSG_SCOPE_SELF) ? GetIndustryRandomBits(tile) : GetIndustryByTile(tile)->random;
+	return (object->scope == VSG_SCOPE_SELF) ? GetIndustryRandomBits(tile) : Industry::GetByTile(tile)->random;
+}
 static uint32 IndustryTileGetTriggers(const ResolverObject *object)
+{
 	const TileIndex tile = object->u.industry.tile;
 	if (tile == INVALID_TILE || !IsTileType(tile, MP_INDUSTRY)) return 0;
-	return (object->scope == VSG_SCOPE_SELF) ? GetIndustryTriggers(tile) : GetIndustryByTile(tile)->random_triggers;
+	return (object->scope == VSG_SCOPE_SELF) ? GetIndustryTriggers(tile) : Industry::GetByTile(tile)->random_triggers;
+}
 static void IndustryTileSetTriggers(const ResolverObject *object, int triggers)
+{
 	const TileIndex tile = object->u.industry.tile;
 	if (tile == INVALID_TILE || !IsTileType(tile, MP_INDUSTRY)) return;
 	if (object->scope == VSG_SCOPE_SELF) {
 		SetIndustryTriggers(tile, triggers);
 	} else {
-		GetIndustryByTile(tile)->random_triggers = triggers;
+		Industry::GetByTile(tile)->random_triggers = triggers;
+	}
+}
 static void NewIndustryTileResolver(ResolverObject *res, IndustryGfx gfx, TileIndex tile, Industry *indus)
+{
 	res->GetRandomBits = IndustryTileGetRandomBits;
@@ @@ -296,13 +296,13 @@ bool PerformIndustryTileSlopeCheck(TileI @@
 		default: _error_message = GetGRFStringID(its->grf_prop.grffile->grfid, 0xD000 + callback_res); return false;
+	}
+}
 void AnimateNewIndustryTile(TileIndex tile)
+{
-	Industry *ind = GetIndustryByTile(tile);
+	Industry *ind = Industry::GetByTile(tile);
 	IndustryGfx gfx = GetIndustryGfx(tile);
 	const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx);
 	byte animation_speed = itspec->animation_speed;
 	if (HasBit(itspec->callback_flags, CBM_INDT_ANIM_SPEED)) {
 		uint16 callback_res = GetIndustryTileCallback(CBID_INDTILE_ANIMATION_SPEED, 0, 0, gfx, ind, tile);
@@ @@ -384,13 +384,13 @@ bool StartStopIndustryTileAnimation(Tile @@
+{
 	IndustryGfx gfx = GetIndustryGfx(tile);
 	const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx);
 	if (!HasBit(itspec->animation_triggers, iat)) return false;
-	Industry *ind = GetIndustryByTile(tile);
+	Industry *ind = Industry::GetByTile(tile);
 	ChangeIndustryTileAnimationFrame(itspec, tile, iat, random, gfx, ind);
 	return true;
+}
 bool StartStopIndustryTileAnimation(const Industry *ind, IndustryAnimationTrigger iat)
+{
@@ @@ -433,13 +433,13 @@ static void DoTriggerIndustryTile(TileIn @@
 	SetIndustryRandomBits(tile, random_bits);
 	MarkTileDirtyByTile(tile);
+}
 void TriggerIndustryTile(TileIndex tile, IndustryTileTrigger trigger)
+{
-	DoTriggerIndustryTile(tile, trigger, GetIndustryByTile(tile));
+	DoTriggerIndustryTile(tile, trigger, Industry::GetByTile(tile));
+}
 void TriggerIndustry(Industry *ind, IndustryTileTrigger trigger)
+{
 	TILE_LOOP(tile, ind->width, ind->height, ind->xy) {
 		if (IsTileType(tile, MP_INDUSTRY) && GetIndustryIndex(tile) == ind->index) {

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ @@
 #include "../string_func.h"
 #include "../gamelog.h"
 #include "../gamelog_internal.h"
 #include "../network/network.h"
 #include "../gfxinit.h"
 #include "../functions.h"
-#include "../industry_map.h"
+#include "../industry.h"
 #include "../town_map.h"
 #include "../clear_map.h"
 #include "../vehicle_func.h"
 #include "../newgrf_station.h"
 #include "../yapf/yapf.hpp"
 #include "../elrail_func.h"

src/smallmap_gui.cpp

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ @@
  */
 /** @file smallmap_gui.cpp GUI that shows a small map of the world with metadata like owner or height. */
 #include "stdafx.h"
 #include "clear_map.h"
-#include "industry_map.h"
+#include "industry.h"
 #include "station_map.h"
 #include "landscape.h"
 #include "window_gui.h"
 #include "tree_map.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
@@ @@ -405,14 +405,14 @@ static inline uint32 GetSmallMapVehicles @@
 static inline uint32 GetSmallMapIndustriesPixels(TileIndex tile)
+{
 	TileType t = GetEffectiveTileType(tile);
 	if (t == MP_INDUSTRY) {
 		/* If industry is allowed to be seen, use its colour on the map */
 		if (_legend_from_industries[_industry_to_list_pos[GetIndustryByTile(tile)->type]].show_on_map) {
 			return GetIndustrySpec(GetIndustryByTile(tile)->type)->map_colour * 0x01010101;
 		if (_legend_from_industries[_industry_to_list_pos[Industry::GetByTile(tile)->type]].show_on_map) {
 			return GetIndustrySpec(Industry::GetByTile(tile)->type)->map_colour * 0x01010101;
 		} else {
 			/* otherwise, return the colour of the clear tiles, which will make it disappear */
 			return ApplyMask(MKCOLOUR(0x54545454), &_smallmap_vehicles_andor[MP_CLEAR]);
+		}
+	}
@@ @@ -462,13 +462,13 @@ static inline uint32 GetSmallMapVegetati @@
 	switch (t) {
 		case MP_CLEAR:
 			return (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) < 3) ? MKCOLOUR(0x37373737) : _vegetation_clear_bits[GetClearGround(tile)];
 		case MP_INDUSTRY:
-			return GetIndustrySpec(GetIndustryByTile(tile)->type)->check_proc == CHECK_FOREST ? MKCOLOUR(0xD0D0D0D0) : MKCOLOUR(0xB5B5B5B5);
+			return GetIndustrySpec(Industry::GetByTile(tile)->type)->check_proc == CHECK_FOREST ? MKCOLOUR(0xD0D0D0D0) : MKCOLOUR(0xB5B5B5B5);
 		case MP_TREES:
 			if (GetTreeGround(tile) == TREE_GROUND_SNOW_DESERT) {
 				return (_settings_game.game_creation.landscape == LT_ARCTIC) ? MKCOLOUR(0x98575798) : MKCOLOUR(0xC25757C2);
+			}
 			return MKCOLOUR(0x54575754);

src/station.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
  */
 /** @file station.cpp Implementation of the station base class. */
 #include "stdafx.h"
 #include "company_func.h"
 #include "industry.h"
 #include "newgrf_cargo.h"
 #include "yapf/yapf.h"
 #include "cargotype.h"
 #include "roadveh.h"
 #include "window_type.h"
 #include "station_gui.h"
@@ @@ -28,13 +27,13 @@ @@
 #include "vehicle_gui.h"
 #include "settings_type.h"
 #include "subsidy_func.h"
 #include "core/pool_func.hpp"
 #include "station_base.h"
 #include "roadstop_base.h"
-#include "industry_map.h"
+#include "industry.h"
 #include "table/strings.h"
 StationPool _station_pool("Station");
 INSTANTIATE_POOL_METHODS(Station)
@@ @@ -281,13 +280,13 @@ struct RectAndIndustryVector { @@
 static bool FindIndustryToDeliver(TileIndex ind_tile, void *user_data)
+{
 	/* Only process industry tiles */
 	if (!IsTileType(ind_tile, MP_INDUSTRY)) return false;
 	RectAndIndustryVector *riv = (RectAndIndustryVector *)user_data;
-	Industry *ind = GetIndustryByTile(ind_tile);
+	Industry *ind = Industry::GetByTile(ind_tile);
 	/* Don't check further if this industry is already in the list */
 	if (riv->industries_near->Contains(ind)) return false;
 	/* Only process tiles in the station acceptance rectangle */
 	int x = TileX(ind_tile);

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ @@
 #include "viewport_func.h"
 #include "command_func.h"
 #include "town.h"
 #include "news_func.h"
 #include "train.h"
 #include "roadveh.h"
-#include "industry_map.h"
+#include "industry.h"
 #include "newgrf_station.h"
 #include "newgrf_commons.h"
 #include "yapf/yapf.h"
 #include "road_internal.h" /* For drawing catenary/checking road removal */
 #include "variables.h"
 #include "autoslope.h"
@@ @@ -140,13 +140,13 @@ static int CountMapSquareAround(TileInde @@
  */
 static bool CMSAMine(TileIndex tile)
+{
 	/* No industry */
 	if (!IsTileType(tile, MP_INDUSTRY)) return false;
-	const Industry *ind = GetIndustryByTile(tile);
+	const Industry *ind = Industry::GetByTile(tile);
 	/* No extractive industry */
 	if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_EXTRACTIVE) == 0) return false;
 	for (uint i = 0; i < lengthof(ind->produced_cargo); i++) {
 		/* The industry extracts something non-liquid, i.e. no oil or plastic, so it is a mine.
@@ @@ -187,13 +187,13 @@ static bool CMSATree(TileIndex tile) @@
  */
 static bool CMSAForest(TileIndex tile)
+{
 	/* No industry */
 	if (!IsTileType(tile, MP_INDUSTRY)) return false;
-	const Industry *ind = GetIndustryByTile(tile);
+	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. */

src/water_cmd.cpp

➞

Show inline comments

@@ @@ -20,13 +20,13 @@ @@
 #include "depot_base.h"
 #include "depot_func.h"
 #include "vehicle_gui.h"
 #include "train.h"
 #include "roadveh.h"
 #include "water.h"
-#include "industry_map.h"
+#include "industry.h"
 #include "cargotype.h"
 #include "newgrf_canal.h"
 #include "transparency.h"
 #include "strings_func.h"
 #include "functions.h"
 #include "window_func.h"

0 comments (0 inline, 0 general)