Mercurial > hg > openttd

changeset 7145:df56d401d233 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r10419) -Fix (r10418): do not compare bitmasks with HASBIT. Thanks to Maedhros for spotting this.
author rubidium <rubidium@openttd.org>
date Tue, 03 Jul 2007 19:25:06 +0000 (2007-07-03)
parents 4a108dac9a2b
children aed91cf70536
files src/industry_cmd.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -1624,7 +1624,7 @@
 
 	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 @@
 		}
 	}
 
-	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;
 	}