diff options
| author | Michael Lutz <michi@icosahedron.de> | 2020-04-11 17:12:26 +0200 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2020-06-28 15:33:37 +0200 |
| commit | 6d3c2edc599c3f74cf1aa3e69ddb6d301af62fa0 (patch) | |
| tree | b8a42af45490c959096d72843ffc51766837a3dd | |
| parent | 7a09413a1aabc934c201c19bcae3ad03d7b801c7 (diff) | |
| download | openttd-6d3c2edc599c3f74cf1aa3e69ddb6d301af62fa0.tar.xz | |
Add: [NewGRF] Industry behaviour flag to override second cargo production clamping for water industries when using smooth economy.
Smooth economy is only used when the corresponding setting is enabled and the industries does not use the production callback.
| -rw-r--r-- | src/industry_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/industrytype.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 35def4609..bd1d28ef6 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -2677,7 +2677,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly) /* Prevent production to overflow or Oil Rig passengers to be over-"produced" */ new_prod = Clamp(new_prod, 1, 255); - if (((indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER) != 0) && j == 1) { + if (((indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER) != 0) && j == 1 && !(indspec->behaviour & INDUSTRYBEH_WATER_NO_CLAMP_PROD)) { new_prod = Clamp(new_prod, 0, 16); } diff --git a/src/industrytype.h b/src/industrytype.h index ec4f8f85d..8af486c21 100644 --- a/src/industrytype.h +++ b/src/industrytype.h @@ -80,6 +80,7 @@ enum IndustryBehaviour { INDUSTRYBEH_NOBUILT_MAPCREATION = 1 << 16, ///< Do not force one instance of this type to appear on map generation INDUSTRYBEH_CANCLOSE_LASTINSTANCE = 1 << 17, ///< Allow closing down the last instance of this type INDUSTRYBEH_CARGOTYPES_UNLIMITED = 1 << 18, ///< Allow produced/accepted cargoes callbacks to supply more than 2 and 3 types + INDUSTRYBEH_WATER_NO_CLAMP_PROD = 1 << 19, ///< Do not clamp production of second cargo for water industries }; DECLARE_ENUM_AS_BIT_SET(IndustryBehaviour) |