summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorplanetmaker <planetmaker@openttd.org>2011-06-09 16:35:09 +0000
committerplanetmaker <planetmaker@openttd.org>2011-06-09 16:35:09 +0000
commite5a88a107750b5119b483eb351f504f05a3f599a (patch)
tree206782bfa78e3c86e274e93ed23a30d56e2245fb
parent692d3433fb130800494d61f254a93a18719c75e1 (diff)
downloadopenttd-e5a88a107750b5119b483eb351f504f05a3f599a.tar.xz
(svn r22548) -Codechange: Name also the magic number for the lumber mill's tree cutting action (FeyFre)
-rw-r--r--src/date_type.h1
-rw-r--r--src/industry_cmd.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/date_type.h b/src/date_type.h
index bff1d6577..a004413a7 100644
--- a/src/date_type.h
+++ b/src/date_type.h
@@ -36,6 +36,7 @@ static const int STATION_ACCEPTANCE_TICKS = 250; ///< cycle duration for updatin
static const int CARGO_AGING_TICKS = 185; ///< cycle duration for aging cargo
static const int INDUSTRY_PRODUCE_TICKS = 256; ///< cycle duration for industry production
static const int TOWN_GROWTH_TICKS = 70; ///< cycle duration for towns trying to grow. (this originates from the size of the town array in TTD
+static const int INDUSTRY_CUT_TREE_TICKS = INDUSTRY_PRODUCE_TICKS * 2; ///< cycle duration for lumber mill's extra action
/*
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index d80652faa..4a0391a50 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -1086,7 +1086,7 @@ static void ProduceIndustryGoods(Industry *i)
if (plant) PlantRandomFarmField(i);
}
if ((indbehav & INDUSTRYBEH_CUT_TREES) != 0) {
- bool cut = ((i->counter & 0x1FF) == 0);
+ bool cut = ((i->counter % INDUSTRY_CUT_TREE_TICKS) == 0);
if (HasBit(indsp->callback_mask, CBM_IND_SPECIAL_EFFECT)) {
cut = (GetIndustryCallback(CBID_INDUSTRY_SPECIAL_EFFECT, 0, 1, i, i->type, i->location.tile) != 0);
}