mirror of https://github.com/OpenTTD/OpenTTD.git
Fix #8137: New clients can't join (desync) after funding an industry
This commit is contained in:
parent
7bd52970a1
commit
f2a9a1e2a5
|
@ -1697,9 +1697,11 @@ static void PopulateStationsNearby(Industry *ind)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ForAllStationsAroundTiles(ind->location, [ind](Station *st) {
|
ForAllStationsAroundTiles(ind->location, [ind](Station *st, TileIndex tile) {
|
||||||
|
if (!IsTileType(tile, MP_INDUSTRY) || GetIndustryIndex(tile) != ind->index) return false;
|
||||||
ind->stations_near.insert(st);
|
ind->stations_near.insert(st);
|
||||||
st->AddIndustryToDeliver(ind);
|
st->AddIndustryToDeliver(ind);
|
||||||
|
return true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -560,7 +560,10 @@ void RebuildStationKdtree();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Call a function on all stations that have any part of the requested area within their catchment.
|
* Call a function on all stations that have any part of the requested area within their catchment.
|
||||||
* @param area The tile area to check
|
* @tparam Func The type of funcion to call
|
||||||
|
* @param area The TileArea to check
|
||||||
|
* @param func The function to call, must take two parameters: Station* and TileIndex and return true
|
||||||
|
* if coverage of that tile is acceptable for a given station or false if search should continue
|
||||||
*/
|
*/
|
||||||
template<typename Func>
|
template<typename Func>
|
||||||
void ForAllStationsAroundTiles(const TileArea &ta, Func func)
|
void ForAllStationsAroundTiles(const TileArea &ta, Func func)
|
||||||
|
@ -586,8 +589,7 @@ void ForAllStationsAroundTiles(const TileArea &ta, Func func)
|
||||||
/* Test if the tile is within the station's catchment */
|
/* Test if the tile is within the station's catchment */
|
||||||
TILE_AREA_LOOP(tile, ta) {
|
TILE_AREA_LOOP(tile, ta) {
|
||||||
if (st->TileIsInCatchment(tile)) {
|
if (st->TileIsInCatchment(tile)) {
|
||||||
func(st);
|
if (func(st, tile)) break;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3978,8 +3978,9 @@ const StationList *StationFinder::GetStations()
|
||||||
assert(this->w == 1 && this->h == 1);
|
assert(this->w == 1 && this->h == 1);
|
||||||
AddNearbyStationsByCatchment(this->tile, &this->stations, Town::GetByTile(this->tile)->stations_near);
|
AddNearbyStationsByCatchment(this->tile, &this->stations, Town::GetByTile(this->tile)->stations_near);
|
||||||
} else {
|
} else {
|
||||||
ForAllStationsAroundTiles(*this, [this](Station *st) {
|
ForAllStationsAroundTiles(*this, [this](Station *st, TileIndex tile) {
|
||||||
this->stations.insert(st);
|
this->stations.insert(st);
|
||||||
|
return true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
this->tile = INVALID_TILE;
|
this->tile = INVALID_TILE;
|
||||||
|
|
|
@ -2250,8 +2250,9 @@ static void MakeTownHouse(TileIndex t, Town *town, byte counter, byte stage, Hou
|
||||||
if (size & BUILDING_HAS_4_TILES) ClearMakeHouseTile(t + TileDiffXY(1, 1), town, counter, stage, ++type, random_bits);
|
if (size & BUILDING_HAS_4_TILES) ClearMakeHouseTile(t + TileDiffXY(1, 1), town, counter, stage, ++type, random_bits);
|
||||||
|
|
||||||
if (!_generating_world) {
|
if (!_generating_world) {
|
||||||
ForAllStationsAroundTiles(TileArea(t, (size & BUILDING_2_TILES_X) ? 2 : 1, (size & BUILDING_2_TILES_Y) ? 2 : 1), [town](Station *st) {
|
ForAllStationsAroundTiles(TileArea(t, (size & BUILDING_2_TILES_X) ? 2 : 1, (size & BUILDING_2_TILES_Y) ? 2 : 1), [town](Station *st, TileIndex tile) {
|
||||||
town->stations_near.insert(st);
|
town->stations_near.insert(st);
|
||||||
|
return true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue