(svn r10419) -Fix (r10418): do not compare bitmasks with HASBIT. Thanks to Maedhros for spotting this.

This commit is contained in:
rubidium 2007-07-03 19:25:06 +00:00
parent b67cfd4825
commit bad85b08c2
1 changed files with 2 additions and 2 deletions

View File

@ -1624,7 +1624,7 @@ static void ExtChangeIndustryProduction(Industry *i)
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) {
for (j = 0; j < 2 && indspec->produced_cargo[j] != CT_INVALID; j++){
uint32 r = Random();
int old_prod, new_prod, percent;
@ -1666,7 +1666,7 @@ static void ExtChangeIndustryProduction(Industry *i)
}
}
if (HASBIT(indspec->life_type, INDUSTRYLIFE_PROCESSING)) {
if ((indspec->life_type & INDUSTRYLIFE_PROCESSING) != 0) {
if ((byte)(_cur_year - i->last_prod_year) < 5 || !CHANCE16(1, 180)) closeit = false;
}