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

(svn r10425) -Fix (r10418): do not compare bitmasks with HASBIT. Strike two. Forgotten code :)

release/0.6
belugas 2007-07-04 00:54:38 +00:00
parent 2c38514a84
commit de43302419
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/industry_cmd.cpp
View File

@ -1776,14 +1776,15 @@ static void MaybeNewIndustry(void)
static void ChangeIndustryProduction(Industry *i) static void ChangeIndustryProduction(Industry *i)
{ {
bool only_decrease = false;
StringID str = STR_NULL; StringID str = STR_NULL;
int type = i->type; int type = i->type;
const IndustrySpec *indspec = GetIndustrySpec(type); const IndustrySpec *indspec = GetIndustrySpec(type);
if (indspec->life_type == INDUSTRYLIFE_BLACK_HOLE) return; 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 */ /* decrease or increase */
if ((indspec->behaviour & INDUSTRYBEH_DONT_INCR_PROD) && _opt.landscape == LT_TEMPERATE) if ((indspec->behaviour & INDUSTRYBEH_DONT_INCR_PROD) && _opt.landscape == LT_TEMPERATE)
only_decrease = true; 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 */ /* maybe close */
if ( (byte)(_cur_year - i->last_prod_year) >= 5 && CHANCE16(1, 2)) { if ( (byte)(_cur_year - i->last_prod_year) >= 5 && CHANCE16(1, 2)) {
i->prod_level = 0; i->prod_level = 0;