From 997871063fb08e5bc87c09ed967b50562597b87d Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 4 Jul 2007 22:18:33 +0000 Subject: (svn r10440) -Fix: CBM_IND defines bits to be set, not bitsets. --- src/newgrf_industries.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/newgrf_industries.cpp') diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index 8e0ba446d..bbd561b9f 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -123,7 +123,7 @@ uint32 IndustryGetVariable(const ResolverObject *object, byte variable, byte par case 0x41: case 0x42: { // waiting cargo, but only if those two callback flags are set uint16 callback = indspec->callback_flags; - if (callback & (CBM_IND_PRODUCTION_CARGO_ARRIVAL | CBM_IND_PRODUCTION_256_TICKS)) { + if (HASBIT(callback, CBM_IND_PRODUCTION_CARGO_ARRIVAL) || HASBIT(callback, CBM_IND_PRODUCTION_256_TICKS)) { return max(industry->incoming_cargo_waiting[variable - 0x40], (uint16)0x7FFF); } else { return 0; -- cgit v1.2.3-54-g00ecf