cpp/openttd-patchpack/source Changeset - r23429:dad55774ae34

Changeset - r23429:dad55774ae34

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

peter1138 - 5 years ago 2019-02-24 19:16:24
peter1138@openttd.org

Codechange: Convert IndustryVector to a std::set.

6 files changed with 30 insertions and 19 deletions:

src/cargomonitor.cpp

src/economy.cpp

src/industry_cmd.cpp

src/station.cpp

src/station_base.h

src/subsidy.cpp

0 comments (0 inline, 0 general)

src/cargomonitor.cpp

➞

Show inline comments

@@ @@ -148,14 +148,14 @@ void AddCargoDelivery(CargoID cargo_type @@
 	/* Town delivery. */
 	CargoMonitorID num = EncodeCargoTownMonitor(company, cargo_type, st->town->index);
 	CargoMonitorMap::iterator iter = _cargo_deliveries.find(num);
 	if (iter != _cargo_deliveries.end()) iter->second += amount;
 	/* Industry delivery. */
 	for (const Industry * const *ip = st->industries_near.Begin(); ip != st->industries_near.End(); ip++) {
 		if ((*ip)->index != dest) continue;
 		CargoMonitorID num = EncodeCargoIndustryMonitor(company, cargo_type, (*ip)->index);
 	for (Industry *ind : st->industries_near) {
 		if (ind->index != dest) continue;
 		CargoMonitorID num = EncodeCargoIndustryMonitor(company, cargo_type, ind->index);
 		CargoMonitorMap::iterator iter = _cargo_deliveries.find(num);
 		if (iter != _cargo_deliveries.end()) iter->second += amount;
+	}
+}

src/economy.cpp

➞

Show inline comments

@@ @@ -1041,14 +1041,15 @@ static uint DeliverGoodsToIndustry(const @@
 	 *  2) The industries in the catchment area temporarily reject the cargo, and the daily station loop has not yet updated station acceptance.
 	 *  3) The results of callbacks CBID_INDUSTRY_REFUSE_CARGO and CBID_INDTILE_CARGO_ACCEPTANCE are inconsistent. (documented behaviour)
 	 */
 	uint accepted = 0;
 	for (uint i = 0; i < st->industries_near.Length() && num_pieces != 0; i++) {
 		Industry *ind = st->industries_near[i];
 	for (Industry *ind : st->industries_near) {
 		if (num_pieces == 0) break;
 		if (ind->index == source) continue;
 		if (!_settings_game.station.serve_neutral_industries) {
 			/* If this industry is only served by its neutral station, check it's us. */
 			if (ind->neutral_station != NULL && ind->neutral_station != st) continue;
+		}

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -518,26 +518,26 @@ static bool TransportIndustryGoods(TileI @@
 	StationFinder stations(i->location);
 	StationList neutral;
 	if (i->neutral_station != NULL && !_settings_game.station.serve_neutral_industries) {
 		/* Industry has a neutral station. Use it and ignore any other nearby stations. */
-		*neutral.Append() = i->neutral_station;
+		neutral.insert(i->neutral_station);
+	}
 	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) {
 			i->produced_cargo_waiting[j] -= cw;
 			/* fluctuating economy? */
 			if (EconomyIsInRecession()) cw = (cw + 1) / 2;
 			i->this_month_production[j] += cw;
-			uint am = MoveGoodsToStation(i->produced_cargo[j], cw, ST_INDUSTRY, i->index, neutral.Length() != 0 ? &neutral : stations.GetStations());
+			uint am = MoveGoodsToStation(i->produced_cargo[j], cw, ST_INDUSTRY, i->index, neutral.size() != 0 ? &neutral : stations.GetStations());
 			i->this_month_transported[j] += am;
 			moved_cargo |= (am != 0);
+		}
+	}
@@ @@ -2904,6 +2904,11 @@ extern const TileTypeProcs _tile_type_in @@
 	ChangeTileOwner_Industry,    // change_tile_owner_proc
 	NULL,                        // add_produced_cargo_proc
 	NULL,                        // vehicle_enter_tile_proc
 	GetFoundation_Industry,      // get_foundation_proc
 	TerraformTile_Industry,      // terraform_tile_proc
 };
 bool IndustryCompare::operator() (const Industry *lhs, const Industry *rhs) const
+{
 	return lhs->index < rhs->index;
+}

src/station.cpp

➞

Show inline comments

@@ @@ -304,14 +304,14 @@ Rect Station::GetCatchmentRect() const @@
 	return ret;
+}
 /** Rect and pointer to IndustryVector */
 struct RectAndIndustryVector {
 	Rect rect;                       ///< The rectangle to search the industries in.
 	IndustryVector *industries_near; ///< The nearby industries.
 	Rect rect;                     ///< The rectangle to search the industries in.
 	IndustryList *industries_near; ///< The nearby industries.
 };
 /**
  * Callback function for Station::RecomputeIndustriesNear()
  * Tests whether tile is an industry and possibly adds
  * the industry to station's industries_near list.
@@ @@ -325,13 +325,13 @@ static bool FindIndustryToDeliver(TileIn @@
 	if (!IsTileType(ind_tile, MP_INDUSTRY)) return false;
 	RectAndIndustryVector *riv = (RectAndIndustryVector *)user_data;
 	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;
+	if (riv->industries_near->find(ind) != riv->industries_near->end()) return false;
 	/* Only process tiles in the station acceptance rectangle */
 	int x = TileX(ind_tile);
 	int y = TileY(ind_tile);
 	if (x < riv->rect.left || x > riv->rect.right || y < riv->rect.top || y > riv->rect.bottom) return false;
@@ @@ -339,29 +339,29 @@ static bool FindIndustryToDeliver(TileIn @@
 	uint cargo_index;
 	for (cargo_index = 0; cargo_index < lengthof(ind->accepts_cargo); cargo_index++) {
 		if (ind->accepts_cargo[cargo_index] != CT_INVALID) break;
+	}
 	if (cargo_index >= lengthof(ind->accepts_cargo)) return false;
-	*riv->industries_near->Append() = ind;
+	riv->industries_near->insert(ind);
 	return false;
+}
 /**
  * Recomputes Station::industries_near, list of industries possibly
  * accepting cargo in station's catchment radius
  */
 void Station::RecomputeIndustriesNear()
+{
-	this->industries_near.Clear();
+	this->industries_near.clear();
 	if (this->rect.IsEmpty()) return;
 	if (!_settings_game.station.serve_neutral_industries && this->industry != NULL) {
 		/* Station is associated with an industry, so we only need to deliver to that industry. */
-		*this->industries_near.Append() = this->industry;
+		this->industries_near.insert(this->industry);
 		return;
+	}
 	RectAndIndustryVector riv = {
 		this->GetCatchmentRect(),
 		&this->industries_near

src/station_base.h

➞

Show inline comments

@@ @@ -17,12 +17,13 @@ @@
 #include "newgrf_airport.h"
 #include "cargopacket.h"
 #include "industry_type.h"
 #include "linkgraph/linkgraph_type.h"
 #include "newgrf_storage.h"
 #include <map>
 #include <set>
 typedef Pool<BaseStation, StationID, 32, 64000> StationPool;
 extern StationPool _station_pool;
 static const byte INITIAL_STATION_RATING = 175;
@@ @@ -437,13 +438,17 @@ private: @@
+			}
+		}
 		NOT_REACHED();
+	}
 };
 typedef SmallVector<Industry *, 2> IndustryVector;
 struct IndustryCompare {
 	bool operator() (const Industry *lhs, const Industry *rhs) const;
 };
 typedef std::set<Industry *, IndustryCompare> IndustryList;
 /** Station data structure */
 struct Station FINAL : SpecializedStation<Station, false> {
 public:
 	RoadStop *GetPrimaryRoadStop(RoadStopType type) const
+	{
@@ @@ -469,14 +474,14 @@ public: @@
 	byte last_vehicle_type;
 	std::list<Vehicle *> loading_vehicles;
 	GoodsEntry goods[NUM_CARGO];  ///< Goods at this station
 	CargoTypes always_accepted;       ///< Bitmask of always accepted cargo types (by houses, HQs, industry tiles when industry doesn't accept cargo)
 	IndustryVector industries_near; ///< Cached list of industries near the station that can accept cargo, @see DeliverGoodsToIndustry()
 	Industry *industry;             ///< NOSAVE: Associated industry for neutral stations. (Rebuilt on load from Industry->st)
 	IndustryList industries_near; ///< Cached list of industries near the station that can accept cargo, @see DeliverGoodsToIndustry()
 	Industry *industry;           ///< NOSAVE: Associated industry for neutral stations. (Rebuilt on load from Industry->st)
 	Station(TileIndex tile = INVALID_TILE);
 	~Station();
 	void AddFacility(StationFacility new_facility_bit, TileIndex facil_xy);

src/subsidy.cpp

➞

Show inline comments

@@ @@ -593,15 +593,15 @@ bool CheckSubsidised(CargoID cargo_type, @@
 	 * Think about the case that subsidies are A->B and A->C and station has both B and C in its catchment area */
 	Subsidy *s;
 	FOR_ALL_SUBSIDIES(s) {
 		if (s->cargo_type == cargo_type && s->src_type == src_type && s->src == src && (!s->IsAwarded() || s->awarded == company)) {
 			switch (s->dst_type) {
 				case ST_INDUSTRY:
 					for (const Industry * const *ip = st->industries_near.Begin(); ip != st->industries_near.End(); ip++) {
 						if (s->dst == (*ip)->index) {
 							assert((*ip)->part_of_subsidy & POS_DST);
 					for (Industry *ind : st->industries_near) {
 						if (s->dst == ind->index) {
 							assert(ind->part_of_subsidy & POS_DST);
 							subsidised = true;
 							if (!s->IsAwarded()) s->AwardTo(company);
+						}
+					}
 					break;
 				case ST_TOWN:

0 comments (0 inline, 0 general)