miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make outer station catchment zoning use border highlight

Browse Source
This commit is contained in:
dP
2019-11-04 16:48:59 +03:00
parent 5a7f1e894a
commit b9e442a63a
5 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/zoning_cmd.cpp
View File

@@ -148,18 +148,11 @@ bool IsAreaWithinAcceptanceZoneOfStation(TileArea area) {
* @return true if a station is found
*/
bool IsTileWithinAcceptanceZoneOfStation(TileIndex tile) {
int catchment = _settings_game.station.station_spread + (_settings_game.station.modified_catchment ? MAX_CATCHMENT : CA_UNMODIFIED);
StationFinder morestations(TileArea(TileXY(TileX(tile) - catchment / 2, TileY(tile) - catchment / 2),
catchment, catchment));
StationFinder morestations(TileArea(tile, 1, 1));
for (Station *st: *morestations.GetStations()) {
Rect rect = st->GetCatchmentRect();
if ((uint)rect.left <= TileX(tile) && TileX(tile) <= (uint)rect.right
&& (uint)rect.top <= TileY(tile) && TileY(tile) <= (uint)rect.bottom )
{
if (st->TileIsInCatchment(tile))
return true;
}
}
return false;
}
@@ -210,11 +203,6 @@ SpriteID TileZoneCheckBuildEvaluation(TileIndex tile, Owner owner) {
if (IsTileType(tile, MP_STATION)){
return INVALID_SPRITE_ID;
}
// For provided goods
StationFinder stations(TileArea(tile, 1, 1));
if (!stations.GetStations()->empty()) {
return SPR_PALETTE_ZONING_GREEN;
}
// For accepted goods
if (IsTileWithinAcceptanceZoneOfStation(tile)){
return SPR_PALETTE_ZONING_LIGHT_BLUE;
@@ -447,6 +435,9 @@ void DrawTileZoning(const TileInfo *ti) {
if (p.first && p.second) {
DrawBorderSprites(ti, p.first, GetTownZoneBorderColor(p.second));
}
} else if (_zoning.outer == CHECKSTACATCH) {
auto b = citymania::GetAnyStationCatchmentBorder(ti->tile);
DrawBorderSprites(ti, b, SPR_PALETTE_ZONING_LIGHT_BLUE);
} else {
DrawZoningSprites(SPR_SELECT_TILE, TileZoningSpriteEvaluation(ti->tile, _local_company, _zoning.outer), ti);
}