summaryrefslogtreecommitdiff
path: root/src/newgrf_industries.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-09-14 12:22:57 +0000
committerrubidium <rubidium@openttd.org>2009-09-14 12:22:57 +0000
commit64bafcbe182ef539a31ffed9bd1f19ca0f7ae62a (patch)
tree9684bfe8873532713641d2c70fb5315f60104565 /src/newgrf_industries.cpp
parentd96333b7c3ad8a1cb940f51f5ce510393158a479 (diff)
downloadopenttd-64bafcbe182ef539a31ffed9bd1f19ca0f7ae62a.tar.xz
(svn r17534) -Codechange: unify the naming of callback masks/flags
Diffstat (limited to 'src/newgrf_industries.cpp')
-rw-r--r--src/newgrf_industries.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp
index 25a4da20e..0af9aff62 100644
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -198,7 +198,7 @@ uint32 IndustryGetVariable(const ResolverObject *object, byte variable, byte par
case 0x40:
case 0x41:
case 0x42: { // waiting cargo, but only if those two callback flags are set
- uint16 callback = indspec->callback_flags;
+ uint16 callback = indspec->callback_mask;
if (HasBit(callback, CBM_IND_PRODUCTION_CARGO_ARRIVAL) || HasBit(callback, CBM_IND_PRODUCTION_256_TICKS)) {
if ((indspec->behaviour & INDUSTRYBEH_PROD_MULTI_HNDLING) != 0) {
return min(industry->incoming_cargo_waiting[variable - 0x40] / industry->prod_level, (uint16)0xFFFF);
@@ -495,7 +495,7 @@ bool CheckIfCallBackAllowsAvailability(IndustryType type, IndustryAvailabilityCa
{
const IndustrySpec *indspec = GetIndustrySpec(type);
- if (HasBit(indspec->callback_flags, CBM_IND_AVAILABLE)) {
+ if (HasBit(indspec->callback_mask, CBM_IND_AVAILABLE)) {
uint16 res = GetIndustryCallback(CBID_INDUSTRY_AVAILABLE, 0, creation_type, NULL, type, INVALID_TILE);
if (res != CALLBACK_FAILED) {
return (res == 0);