From 7effb8fd5046ad0cf2effb8dc55661b316bf48d0 Mon Sep 17 00:00:00 2001 From: belugas Date: Fri, 27 Oct 2006 15:54:24 +0000 Subject: (svn r6965) -CodeChange : Add a climate bitmask member to IndutrySpec. Removed a loop that used the array _build_industry_types for that purpose. --- industry.h | 4 ++- industry_cmd.c | 17 ++--------- table/build_industry.h | 81 +++++++++++++++++++++++++------------------------- 3 files changed, 47 insertions(+), 55 deletions(-) diff --git a/industry.h b/industry.h index b53486fdc..0924acf8b 100644 --- a/industry.h +++ b/industry.h @@ -68,7 +68,9 @@ typedef struct IndustrySpec { byte minimal_cargo; CargoID accepts_cargo[3]; - IndustryLifeType life_type; // This is also known as Industry production flag, in newgrf specs + IndustryLifeType life_type; v This is also known as Industry production flag, in newgrf specs + + byte climate_availability; ///< Bitmask, giving landscape enums as bit position StringID name; StringID closure_text; diff --git a/industry_cmd.c b/industry_cmd.c index 95d20c6d1..b1ae892fd 100644 --- a/industry_cmd.c +++ b/industry_cmd.c @@ -1503,22 +1503,11 @@ int32 CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) SET_EXPENSES_TYPE(EXPENSES_OTHER); - /* Check if the to-be built/founded industry is available for this climate. - * Unfortunately we have no easy way of checking, except for looping the table */ - { - const byte *i; - bool found = false; + indspec = GetIndustrySpec(p1); - for (i = &_build_industry_types[_opt_ptr->landscape][0]; i != endof(_build_industry_types[_opt_ptr->landscape]); i++) { - if (*i == p1) { - found = true; - break; - } - } - if (!found) return CMD_ERROR; - } + /* Check if the to-be built/founded industry is available for this climate. */ + if (!HASBIT(indspec->climate_availability, _opt_ptr->landscape)) return CMD_ERROR; - indspec = GetIndustrySpec(p1); /* If the patch for raw-material industries is not on, you cannot build raw-material industries. * Raw material industries are industries that do not accept cargo (at least for now) * Exclude the lumber mill (only "raw" industry that can be built) */ diff --git a/table/build_industry.h b/table/build_industry.h index 881e08de6..57fd7d569 100644 --- a/table/build_industry.h +++ b/table/build_industry.h @@ -1080,9 +1080,9 @@ typedef enum CheckProcs { CHECK_END, } CheckProc; -#define MK(tbl, d, c1, c2, c3, proc, p1, r1, p2, r2, m, a1, a2, a3, pr, in, s1, s2, s3) \ +#define MK(tbl, d, c1, c2, c3, proc, p1, r1, p2, r2, m, a1, a2, a3, pr, clim, in, s1, s2, s3) \ {tbl, lengthof(tbl), d, {c1, c2, c3}, proc, {p1, p2}, {r1, r2}, m, \ - {a1, a2, a3}, pr, in, s1, s2, s3} + {a1, a2, a3}, pr, clim, in, s1, s2, s3} static const IndustrySpec _industry_specs[] = { /* Format: @@ -1090,13 +1090,14 @@ static const IndustrySpec _industry_specs[] = { cannot be close to these industries (3 times) check proc (produced cargo + rate) (twice) minimum cargo moved to station 3 accepted cargo - industry life + industry life climate availability + industry name messages : Closure production up production down */ MK(_tile_table_coal_mine, 210, IT_POWER_STATION, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_COAL, 15, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_NORMAL | 1 << LT_HILLY, STR_4802_COAL_MINE, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4836_NEW_COAL_SEAM_FOUND_AT, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1104,7 +1105,7 @@ static const IndustrySpec _industry_specs[] = { IT_COAL_MINE, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_INVALID, 0, CT_INVALID, 0, 5, CT_COAL, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_NOT_CLOSABLE, + INDUSTRYLIFE_NOT_CLOSABLE, 1 << LT_NORMAL | 1 << LT_HILLY, STR_4803_POWER_STATION, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1112,7 +1113,7 @@ static const IndustrySpec _industry_specs[] = { IT_FOREST, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_GOODS, 0, CT_INVALID, 0, 5, CT_WOOD, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_NORMAL, STR_4804_SAWMILL, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1120,7 +1121,7 @@ static const IndustrySpec _industry_specs[] = { IT_SAWMILL, IT_PAPER_MILL, IT_INVALID, CHECK_FOREST, CT_WOOD, 13, CT_INVALID, 0, 30, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_NORMAL | 1 << LT_HILLY, STR_4805_FOREST, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_483A_INSECT_INFESTATION_CAUSES), @@ -1128,7 +1129,7 @@ static const IndustrySpec _industry_specs[] = { IT_OIL_RIG, IT_INVALID, IT_INVALID, CHECK_REFINERY, CT_GOODS, 0, CT_INVALID, 0, 5, CT_OIL, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_NORMAL | 1 << LT_HILLY || LT_DESERT, STR_4806_OIL_REFINERY, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1136,7 +1137,7 @@ static const IndustrySpec _industry_specs[] = { IT_OIL_REFINERY, IT_INVALID, IT_INVALID, CHECK_OIL_RIG, CT_OIL, 15, CT_PASSENGERS, 2, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_NORMAL, STR_4807_OIL_RIG, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4837_NEW_OIL_RESERVES_FOUND, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1144,7 +1145,7 @@ static const IndustrySpec _industry_specs[] = { IT_FARM, IT_STEEL_MILL, IT_INVALID, CHECK_NOTHING, CT_GOODS, 0, CT_INVALID, 0, 5, CT_LIVESTOCK, CT_GRAIN, CT_STEEL, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_NORMAL, STR_4808_FACTORY, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1152,7 +1153,7 @@ static const IndustrySpec _industry_specs[] = { IT_PAPER_MILL, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_GOODS, 0, CT_INVALID, 0, 5, CT_PAPER, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_HILLY, STR_4809_PRINTING_WORKS, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1160,7 +1161,7 @@ static const IndustrySpec _industry_specs[] = { IT_IRON_MINE, IT_FACTORY, IT_INVALID, CHECK_NOTHING, CT_STEEL, 0, CT_INVALID, 0, 5, CT_IRON_ORE, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_NORMAL, STR_480A_STEEL_MILL, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1168,7 +1169,7 @@ static const IndustrySpec _industry_specs[] = { IT_FACTORY, IT_FOOD_PROCESS, IT_INVALID, CHECK_FARM, CT_GRAIN, 10, CT_LIVESTOCK, 10, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_NORMAL | 1 << LT_HILLY, STR_480B_FARM, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_483A_INSECT_INFESTATION_CAUSES), @@ -1176,7 +1177,7 @@ static const IndustrySpec _industry_specs[] = { IT_FACTORY_2, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_COPPER_ORE, 10, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_DESERT, STR_480C_COPPER_ORE_MINE, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1184,7 +1185,7 @@ static const IndustrySpec _industry_specs[] = { IT_OIL_REFINERY, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_OIL, 12, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_NORMAL | 1 << LT_HILLY | 1 << LT_DESERT, STR_480D_OIL_WELLS, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4837_NEW_OIL_RESERVES_FOUND, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1192,7 +1193,7 @@ static const IndustrySpec _industry_specs[] = { IT_BANK_TEMP, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_VALUABLES, 6, CT_INVALID, 0, 5, CT_VALUABLES, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_NOT_CLOSABLE, + INDUSTRYLIFE_NOT_CLOSABLE, 1 << LT_NORMAL, STR_480E_BANK, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1200,7 +1201,7 @@ static const IndustrySpec _industry_specs[] = { IT_FRUIT_PLANTATION, IT_FARM, IT_FARM_2, CHECK_NOTHING, CT_FOOD, 0, CT_INVALID, 0, 5, CT_FRUIT, CT_MAIZE, CT_INVALID, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_HILLY | 1 << LT_DESERT, STR_480F_FOOD_PROCESSING_PLANT, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1208,7 +1209,7 @@ static const IndustrySpec _industry_specs[] = { IT_FOREST, IT_PRINTING_WORKS, IT_INVALID, CHECK_NOTHING, CT_PAPER, 0, CT_INVALID, 0, 5, CT_WOOD, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_DESERT, STR_4810_PAPER_MILL, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1216,7 +1217,7 @@ static const IndustrySpec _industry_specs[] = { IT_BANK_TROPIC_ARCTIC, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_GOLD, 7, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_DESERT, STR_4811_GOLD_MINE, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1224,7 +1225,7 @@ static const IndustrySpec _industry_specs[] = { IT_GOLD_MINE, IT_DIAMOND_MINE, IT_INVALID, CHECK_NOTHING, CT_INVALID, 0, CT_INVALID, 0, 5, CT_GOLD, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_NOT_CLOSABLE, + INDUSTRYLIFE_NOT_CLOSABLE, 1 << LT_HILLY | 1 << LT_DESERT, STR_4812_BANK, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1232,7 +1233,7 @@ static const IndustrySpec _industry_specs[] = { IT_BANK_TROPIC_ARCTIC, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_DIAMONDS, 7, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_DESERT, STR_4813_DIAMOND_MINE, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1240,7 +1241,7 @@ static const IndustrySpec _industry_specs[] = { IT_STEEL_MILL, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_IRON_ORE, 10, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_NORMAL, STR_4814_IRON_ORE_MINE, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1248,7 +1249,7 @@ static const IndustrySpec _industry_specs[] = { IT_FOOD_PROCESS, IT_INVALID, IT_INVALID, CHECK_PLANTATION, CT_FRUIT, 10, CT_INVALID, 0, 15, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_DESERT, STR_4815_FRUIT_PLANTATION, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_483A_INSECT_INFESTATION_CAUSES), @@ -1256,7 +1257,7 @@ static const IndustrySpec _industry_specs[] = { IT_FACTORY_2, IT_INVALID, IT_INVALID, CHECK_PLANTATION, CT_RUBBER, 10, CT_INVALID, 0, 15, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_DESERT, STR_4816_RUBBER_PLANTATION, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_483A_INSECT_INFESTATION_CAUSES), @@ -1264,7 +1265,7 @@ static const IndustrySpec _industry_specs[] = { IT_WATER_TOWER, IT_INVALID, IT_INVALID, CHECK_WATER, CT_WATER, 12, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_DESERT, STR_4817_WATER_SUPPLY, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1272,7 +1273,7 @@ static const IndustrySpec _industry_specs[] = { IT_WATER_SUPPLY, IT_INVALID, IT_INVALID, CHECK_WATER, CT_INVALID, 0, CT_INVALID, 0, 5, CT_WATER, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_NOT_CLOSABLE, + INDUSTRYLIFE_NOT_CLOSABLE, 1 << LT_DESERT, STR_4818_WATER_TOWER, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1280,7 +1281,7 @@ static const IndustrySpec _industry_specs[] = { IT_RUBBER_PLANTATION, IT_COPPER_MINE, IT_LUMBER_MILL, CHECK_PLANTATION, CT_GOODS, 0, CT_INVALID, 0, 5, CT_RUBBER, CT_COPPER_ORE, CT_WOOD, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_DESERT, STR_4819_FACTORY, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1288,7 +1289,7 @@ static const IndustrySpec _industry_specs[] = { IT_FOOD_PROCESS, IT_INVALID, IT_INVALID, CHECK_PLANTATION, CT_MAIZE, 11, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_DESERT, STR_481A_FARM, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_483A_INSECT_INFESTATION_CAUSES), @@ -1296,7 +1297,7 @@ static const IndustrySpec _industry_specs[] = { IT_FACTORY_2, IT_INVALID, IT_INVALID, CHECK_LUMBERMILL, CT_WOOD, 0, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_DESERT, STR_481B_LUMBER_MILL, STR_4834_LACK_OF_NEARBY_TREES_CAUSES, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1304,7 +1305,7 @@ static const IndustrySpec _industry_specs[] = { IT_CANDY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_COTTON_CANDY, 13, CT_INVALID, 0, 30, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_CANDY, STR_481C_COTTON_CANDY_FOREST, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1312,7 +1313,7 @@ static const IndustrySpec _industry_specs[] = { IT_COTTON_CANDY, IT_TOFFEE_QUARRY, IT_SUGAR_MINE, CHECK_NOTHING, CT_CANDY, 0, CT_INVALID, 0, 5, CT_SUGAR, CT_TOFFEE, CT_COTTON_CANDY, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_CANDY, STR_481D_CANDY_FACTORY, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1320,7 +1321,7 @@ static const IndustrySpec _industry_specs[] = { IT_TOY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_BATTERIES, 11, CT_INVALID, 0, 30, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_CANDY, STR_481E_BATTERY_FARM, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4838_IMPROVED_FARMING_METHODS, STR_483A_INSECT_INFESTATION_CAUSES), @@ -1328,7 +1329,7 @@ static const IndustrySpec _industry_specs[] = { IT_FIZZY_DRINK_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_COLA, 12, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_CANDY, STR_481F_COLA_WELLS, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1336,7 +1337,7 @@ static const IndustrySpec _industry_specs[] = { IT_TOY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_INVALID, 0, CT_INVALID, 0, 5, CT_TOYS, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_NOT_CLOSABLE, + INDUSTRYLIFE_NOT_CLOSABLE, 1 << LT_CANDY, STR_4820_TOY_SHOP, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1344,7 +1345,7 @@ static const IndustrySpec _industry_specs[] = { IT_PLASTIC_FOUNTAINS, IT_BATTERY_FARM, IT_TOY_SHOP, CHECK_NOTHING, CT_TOYS, 0, CT_INVALID, 0, 5, CT_PLASTIC, CT_BATTERIES, CT_INVALID, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_CANDY, STR_4821_TOY_FACTORY, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1352,7 +1353,7 @@ static const IndustrySpec _industry_specs[] = { IT_TOY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_PLASTIC, 14, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_CANDY, STR_4822_PLASTIC_FOUNTAINS, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1360,7 +1361,7 @@ static const IndustrySpec _industry_specs[] = { IT_COLA_WELLS, IT_BUBBLE_GENERATOR, IT_INVALID, CHECK_NOTHING, CT_FIZZY_DRINKS, 0, CT_INVALID, 0, 5, CT_COLA, CT_BUBBLES, CT_INVALID, - INDUSTRYLIFE_CLOSABLE, + INDUSTRYLIFE_CLOSABLE, 1 << LT_CANDY, STR_4823_FIZZY_DRINK_FACTORY, STR_4833_SUPPLY_PROBLEMS_CAUSE_TO, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1368,7 +1369,7 @@ static const IndustrySpec _industry_specs[] = { IT_FIZZY_DRINK_FACTORY, IT_INVALID, IT_INVALID, CHECK_BUBBLEGEN, CT_BUBBLES, 13, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_CANDY, STR_4824_BUBBLE_GENERATOR, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1376,7 +1377,7 @@ static const IndustrySpec _industry_specs[] = { IT_CANDY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_TOFFEE, 10, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_CANDY, STR_4825_TOFFEE_QUARRY, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), @@ -1384,7 +1385,7 @@ static const IndustrySpec _industry_specs[] = { IT_CANDY_FACTORY, IT_INVALID, IT_INVALID, CHECK_NOTHING, CT_SUGAR, 11, CT_INVALID, 0, 5, CT_INVALID, CT_INVALID, CT_INVALID, - INDUSTRYLIFE_PRODUCTION, + INDUSTRYLIFE_PRODUCTION, 1 << LT_CANDY, STR_4826_SUGAR_MINE, STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50), }; -- cgit v1.2.3-54-g00ecf