cpp/openttd-patchpack/source Changeset - r19283:ea0c3eeb26bb

Changeset - r19283:ea0c3eeb26bb

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 12 years ago 2012-04-28 16:44:01
frosch@openttd.org

(svn r24186) -Feature: [NewGRF] Callback to set industry production level on construction. (andythenorth)

3 files changed with 25 insertions and 5 deletions:

src/industry_cmd.cpp

src/newgrf_callbacks.h

src/table/newgrf_debug_data.h

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -1655,8 +1655,6 @@ static void DoCreateNewIndustry(Industry @@
 	i->last_month_transported[1] = 0;
 	i->was_cargo_delivered = false;
 	i->last_prod_year = _cur_year;
 	i->last_month_production[0] = i->production_rate[0] * 8;
 	i->last_month_production[1] = i->production_rate[1] * 8;
 	i->founder = founder;
 	i->construction_date = _date;
@@ @@ -1668,12 +1666,29 @@ static void DoCreateNewIndustry(Industry @@
 	 * else, chosen layout + 1 */
 	i->selected_layout = layout + 1;
 	if (!_generating_world) i->last_month_production[0] = i->last_month_production[1] = 0;
 	i->prod_level = PRODLEVEL_DEFAULT;
 	/* Call callbacks after the regular fields got initialised. */
 	if (HasBit(indspec->callback_mask, CBM_IND_PROD_CHANGE_BUILD)) {
 		uint16 res = GetIndustryCallback(CBID_INDUSTRY_PROD_CHANGE_BUILD, 0, Random(), i, type, INVALID_TILE);
 		if (res != CALLBACK_FAILED) {
 			if (res < PRODLEVEL_MINIMUM || res > PRODLEVEL_MAXIMUM) {
 				ErrorUnknownCallbackResult(indspec->grf_prop.grffile->grfid, CBID_INDUSTRY_PROD_CHANGE_BUILD, res);
 			} else {
 				i->prod_level = res;
 				i->RecomputeProductionMultipliers();
+			}
+		}
+	}
 	if (_generating_world) {
 		i->last_month_production[0] = i->production_rate[0] * 8;
 		i->last_month_production[1] = i->production_rate[1] * 8;
 	} else {
 		i->last_month_production[0] = i->last_month_production[1] = 0;
+	}
 	if (HasBit(indspec->callback_mask, CBM_IND_DECIDE_COLOUR)) {
 		uint16 res = GetIndustryCallback(CBID_INDUSTRY_DECIDE_COLOUR, 0, 0, i, type, INVALID_TILE);
 		if (res != CALLBACK_FAILED) {
@@ @@ -2741,7 +2756,7 @@ bool IndustrySpec::UsesSmoothEconomy() c @@
+{
 	return _settings_game.economy.smooth_economy &&
 		!(HasBit(this->callback_mask, CBM_IND_PRODUCTION_256_TICKS) || HasBit(this->callback_mask, CBM_IND_PRODUCTION_CARGO_ARRIVAL)) && // production callbacks
-		!(HasBit(this->callback_mask, CBM_IND_MONTHLYPROD_CHANGE) || HasBit(this->callback_mask, CBM_IND_PRODUCTION_CHANGE));            // production change callbacks
+		!(HasBit(this->callback_mask, CBM_IND_MONTHLYPROD_CHANGE) || HasBit(this->callback_mask, CBM_IND_PRODUCTION_CHANGE) || HasBit(this->callback_mask, CBM_IND_PROD_CHANGE_BUILD)); // production change callbacks
+}
 static CommandCost TerraformTile_Industry(TileIndex tile, DoCommandFlag flags, int z_new, Slope tileh_new)

src/newgrf_callbacks.h

➞

Show inline comments

@@ @@ -275,6 +275,9 @@ enum CallbackID { @@
 	/** Called to determine the cost factor for refitting a vehicle. */
 	CBID_VEHICLE_REFIT_COST              = 0x15E, // 15 bit callback
 	/** Called when industry is built to set initial production level. */
 	CBID_INDUSTRY_PROD_CHANGE_BUILD      = 0x15F, // 15 bit callback
 };
 /**
@@ @@ -355,6 +358,7 @@ enum IndustryCallbackMask { @@
 	CBM_IND_DECIDE_COLOUR             = 11, ///< give a custom colour to newly build industries
 	CBM_IND_INPUT_CARGO_TYPES         = 12, ///< customize the cargoes the industry requires
 	CBM_IND_OUTPUT_CARGO_TYPES        = 13, ///< customize the cargoes the industry produces
 	CBM_IND_PROD_CHANGE_BUILD         = 14, ///< initialise production level on construction
 };
 /**

src/table/newgrf_debug_data.h

➞

Show inline comments

@@ @@ -265,6 +265,7 @@ static const NICallback _nic_industries[ @@
 	NICI(CBID_INDUSTRY_DECIDE_COLOUR,        CBM_IND_DECIDE_COLOUR),
 	NICI(CBID_INDUSTRY_INPUT_CARGO_TYPES,    CBM_IND_INPUT_CARGO_TYPES),
 	NICI(CBID_INDUSTRY_OUTPUT_CARGO_TYPES,   CBM_IND_OUTPUT_CARGO_TYPES),
 	NICI(CBID_INDUSTRY_PROD_CHANGE_BUILD,    CBM_IND_PROD_CHANGE_BUILD),
 	NIC_END()
 };

0 comments (0 inline, 0 general)