Old revision #pvwc6g3dv | New revision #pbcxineit | ||
---|---|---|---|
1 | for (int yc = y1; yc != y2; yc++) { | 1 | for (int yc = y1; yc != y2; yc++) { |
2 | for (int xc = x1; xc != x2; xc++) { | 2 | for (int xc = x1; xc != x2; xc++) { |
3 | TileIndex tile = TileXY(xc, yc); | 3 | TileIndex tile = TileXY(xc, yc); |
4 | if (!IsTileType(tile, MP_INDUSTRY)) { | 4 | |
5 | if (_settings_game.station.serve_water_industries) { | ||
5 | AddAcceptedCargo(tile, acceptance, always_accepted); | 6 | AddAcceptedCargo(tile, acceptance, always_accepted); |
6 | } else { | 7 | } else { |
7 | const Industry *ind = Industry::GetByTile(tile); | 7 | if (st_ind == INVALID_INDUSTRY) { |
8 | if (!HasIndustryStation(ind)) { | 8 | if (!IsTileType(tile, MP_INDUSTRY)) { |
9 | if (st_ind == INVALID_INDUSTRY || _settings_game.station.serve_water_industries) { | ||
10 | AddAcceptedCargo(tile, acceptance, always_accepted); | 10 | AddAcceptedCargo(tile, acceptance, always_accepted); |
11 | } else { | ||
12 | if (!HasIndustryStation(Industry::GetByTile(tile))) { | ||
13 | AddAcceptedCargo(tile, acceptance, always_accepted); | ||
14 | } | ||
11 | } | 15 | } |
12 | } else { | 16 | } else { |
13 | if ( | 13 | if (IsTileType(tile, MP_INDUSTRY) && Industry::GetByTile(tile)->index == st_ind) { |
14 | AddAcceptedCargo(tile, acceptance, always_accepted); | 18 | AddAcceptedCargo(tile, acceptance, always_accepted); |
15 | |||
16 | |||
17 | |||
18 | |||
19 | } | 19 | } |
20 | } | 20 | } |
21 | } | 21 | } |