Mercurial > hg > openttd
changeset 7431:fef6fd396d03 draft
(svn r10836) -Fix [FS#1014]: Make sure the third cargo type accepted by houses is valid in
the current climate when copying properties from existing houses and using
action 0 property 0F.
author | maedhros <maedhros@openttd.org> |
---|---|
date | Fri, 10 Aug 2007 08:57:04 +0000 |
parents | 5ec86d3c460f |
children | f4b6ca5ab56e |
files | src/newgrf.cpp |
diffstat | 1 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -1242,6 +1242,14 @@ housespec->random_colour[2] = 0x0C; // they stand for red, blue, orange and green housespec->random_colour[3] = 0x06; + /* Make sure that the third cargo type is valid in this + * climate. This can cause problems when copying the properties + * of a house that accepts food, where the new house is valid + * in the temperate climate. */ + if (!GetCargo(housespec->accepts_cargo[2])->IsValid()) { + housespec->cargo_acceptance[2] = 0; + } + /** * New houses do not (currently) expect to have a default start * date before 1930, as this breaks the build date stuff. @@ -1280,9 +1288,13 @@ /* If value of goods is negative, it means in fact food or, if in toyland, fizzy_drink acceptance. * Else, we have "standard" 3rd cargo type, goods or candy, for toyland once more */ - housespec->accepts_cargo[2] = (goods >= 0) ? ((_opt.landscape == LT_TOYLAND) ? CT_CANDY : CT_GOODS) : + CargoID cid = (goods >= 0) ? ((_opt.landscape == LT_TOYLAND) ? CT_CANDY : CT_GOODS) : ((_opt.landscape == LT_TOYLAND) ? CT_FIZZY_DRINKS : CT_FOOD); + /* Make sure the cargo type is valid in this climate. */ + if (!GetCargo(cid)->IsValid()) goods = 0; + + housespec->accepts_cargo[2] = cid; housespec->cargo_acceptance[2] = abs(goods); // but we do need positive value here } break;