Mercurial > hg > openttd
changeset 7151:df7a8a73bc82 draft
(svn r10425) -Fix (r10418): do not compare bitmasks with HASBIT. Strike two. Forgotten code :)
| author | belugas <belugas@openttd.org> |
|---|---|
| date | Wed, 04 Jul 2007 00:54:38 +0000 |
| parents | 1abc5f2b5c81 |
| children | 70c7afefcca5 |
| files | src/industry_cmd.cpp |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1776,14 +1776,15 @@ static void ChangeIndustryProduction(Industry *i) { - bool only_decrease = false; StringID str = STR_NULL; int type = i->type; const IndustrySpec *indspec = GetIndustrySpec(type); if (indspec->life_type == INDUSTRYLIFE_BLACK_HOLE) return; - if (HASBIT(indspec->life_type, INDUSTRYLIFE_ORGANIC) || HASBIT(indspec->life_type, INDUSTRYLIFE_EXTRACTIVE)) { + if ((indspec->life_type & (INDUSTRYLIFE_ORGANIC | INDUSTRYLIFE_EXTRACTIVE)) != 0) { + bool only_decrease = false; + /* decrease or increase */ if ((indspec->behaviour & INDUSTRYBEH_DONT_INCR_PROD) && _opt.landscape == LT_TEMPERATE) only_decrease = true; @@ -1824,7 +1825,7 @@ } } } - if (HASBIT(indspec->life_type, INDUSTRYLIFE_PROCESSING)) { + if (indspec->life_type & INDUSTRYLIFE_PROCESSING) { /* maybe close */ if ( (byte)(_cur_year - i->last_prod_year) >= 5 && CHANCE16(1, 2)) { i->prod_level = 0;