dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change: Deliver cargo to the closest industry first (#9536)

Browse Source
This commit is contained in:
dP
2022-02-19 21:08:23 +03:00
committed by GitHub
parent e68bf58989
commit 36bee83864
6 changed files with 60 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/station_base.h
View File

@@ -437,11 +437,18 @@ private:
}
};
struct IndustryCompare {
bool operator() (const Industry *lhs, const Industry *rhs) const;
struct IndustryListEntry {
uint distance;
Industry *industry;
bool operator== (const IndustryListEntry &other) const { return this->distance == other.distance && this->industry == other.industry; };
};
typedef std::set<Industry *, IndustryCompare> IndustryList;
struct IndustryCompare {
bool operator() (const IndustryListEntry &lhs, const IndustryListEntry &rhs) const;
};
typedef std::set<IndustryListEntry, IndustryCompare> IndustryList;
/** Station data structure */
struct Station FINAL : SpecializedStation<Station, false> {
@@ -500,7 +507,8 @@ public:
uint GetCatchmentRadius() const;
Rect GetCatchmentRect() const;
bool CatchmentCoversTown(TownID t) const;
void AddIndustryToDeliver(Industry *ind);
void AddIndustryToDeliver(Industry *ind, TileIndex tile);
void RemoveIndustryToDeliver(Industry *ind);
void RemoveFromAllNearbyLists();
inline bool TileIsInCatchment(TileIndex tile) const