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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/industry_cmd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
This commit is contained in:
Jonathan G Rennison
2020-05-14 00:40:16 +01:00
parent a94a8da990 83cd040c61
commit d37d08ebb3
10 changed files with 99 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/station.cpp
View File

@@ -378,12 +378,11 @@ bool Station::IsWithinRangeOfDockingTile(TileIndex tile, uint max_distance) cons
/**
* Add nearby industry to station's industries_near list if it accepts cargo.
* @param ind Industry
* @param st Station
*/
static void AddIndustryToDeliver(Industry *ind, Station *st)
void Station::AddIndustryToDeliver(Industry *ind)
{
/* Don't check further if this industry is already in the list */
if (st->industries_near.find(ind) != st->industries_near.end()) return;
if (this->industries_near.find(ind) != this->industries_near.end()) return;
/* Include only industries that can accept cargo */
uint cargo_index;
@@ -392,7 +391,7 @@ static void AddIndustryToDeliver(Industry *ind, Station *st)
}
if (cargo_index >= lengthof(ind->accepts_cargo)) return;
st->industries_near.insert(ind);
this->industries_near.insert(ind);
}
/**
@@ -483,7 +482,7 @@ void Station::RecomputeCatchment(bool no_clear_nearby_lists)
i->stations_near.insert(this);
/* Add if we can deliver to this industry as well */
AddIndustryToDeliver(i, this);
this->AddIndustryToDeliver(i);
}
}
}