diff options
| author | belugas <belugas@openttd.org> | 2007-07-04 00:54:38 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2007-07-04 00:54:38 +0000 |
| commit | de4330241929d133d513c75c5a7c0445dcc0092d (patch) | |
| tree | fc3f98952aa2835d0f7ee8c6c16c3b38bec8d9cb | |
| parent | 2c38514a84d0de80ff38d298d0571ba415c5d899 (diff) | |
| download | openttd-de4330241929d133d513c75c5a7c0445dcc0092d.tar.xz | |
(svn r10425) -Fix (r10418): do not compare bitmasks with HASBIT. Strike two. Forgotten code :)
| -rw-r--r-- | src/industry_cmd.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 188572edf..2e262d836 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1776,14 +1776,15 @@ static void MaybeNewIndustry(void) 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 @@ static void ChangeIndustryProduction(Industry *i) } } } - 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; |