mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20751) -Fix: IndustryCargoesWindow::HousesCanAccept() did not check climate-availability of houses.

release/1.1
frosch 2010-09-05 19:46:04 +00:00
parent 86a553f01f
commit e4091f16d0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/industry_gui.cpp
View File

@ -2034,12 +2034,20 @@ struct IndustryCargoesWindow : public Window {
*/ */
static bool HousesCanAccept(const CargoID *cargoes, uint length) static bool HousesCanAccept(const CargoID *cargoes, uint length)
{ {
HouseZones climate_mask;
switch (_settings_game.game_creation.landscape) {
case LT_TEMPERATE: climate_mask = HZ_TEMP; break;
case LT_ARCTIC: climate_mask = HZ_SUBARTC_ABOVE | HZ_SUBARTC_BELOW; break;
case LT_TROPIC: climate_mask = HZ_SUBTROPIC; break;
case LT_TOYLAND: climate_mask = HZ_TOYLND; break;
default: NOT_REACHED();
}
for (uint i = 0; i < length; i++) { for (uint i = 0; i < length; i++) {
if (cargoes[i] == INVALID_CARGO) continue; if (cargoes[i] == INVALID_CARGO) continue;
for (uint h = 0; h < HOUSE_MAX; h++) { for (uint h = 0; h < HOUSE_MAX; h++) {
HouseSpec *hs = HouseSpec::Get(h); HouseSpec *hs = HouseSpec::Get(h);
if (!hs->enabled) continue; if (!hs->enabled || !(hs->building_availability & climate_mask)) continue;
for (uint j = 0; j < lengthof(hs->accepts_cargo); j++) { for (uint j = 0; j < lengthof(hs->accepts_cargo); j++) {
if (cargoes[i] == hs->accepts_cargo[j]) return true; if (cargoes[i] == hs->accepts_cargo[j]) return true;