openttd-mini: industry_cmd.c@b08ce1bbb589 (annotated)

2186 db48cf29b983 (svn r2701) Insert Id tags into all source files tron parents: 2163 diff changeset	1	/* $Id$ */
db48cf29b983 (svn r2701) Insert Id tags into all source files tron parents: 2163 diff changeset	2
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	3	#include "stdafx.h"
1891 862800791170 (svn r2397) - CodeChange: rename all "ttd" files to "openttd" files. Darkvater parents: 1881 diff changeset	4	#include "openttd.h"
3144 33e42feae531 (svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme tron parents: 3094 diff changeset	5	#include "clear_map.h"
3314 6aaeba4b92e8 (svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile tron parents: 3296 diff changeset	6	#include "industry_map.h"
3338 7cff208f0446 (svn r4120) Use the new station functions where appropriate tron parents: 3331 diff changeset	7	#include "station_map.h"
507 04b5403aaf6b (svn r815) Include strings.h only in the files which need it. tron parents: 497 diff changeset	8	#include "table/strings.h"
2148 542ea702738c (svn r2658) -Codechange: Use MAKE_TRANSPARENT to display a transparented sprite celestar parents: 2140 diff changeset	9	#include "table/sprites.h"
2163 b17b313113a0 (svn r2673) Include functions.h directly, not globally via openttd.h tron parents: 2159 diff changeset	10	#include "functions.h"
679 04ca2cd69420 (svn r1117) Move map arrays and some related macros into their own files map.c and map.h tron parents: 552 diff changeset	11	#include "map.h"
1209 2e00193652b2 (svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h tron parents: 1202 diff changeset	12	#include "tile.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	13	#include "viewport.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	14	#include "command.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	15	#include "industry.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	16	#include "town.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	17	#include "vehicle.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	18	#include "news.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	19	#include "saveload.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	20	#include "economy.h"
337 cbe0c766c947 (svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk tron parents: 314 diff changeset	21	#include "sound.h"
2159 f6284cf5fab0 (svn r2669) Shuffle some more stuff around to reduce dependencies tron parents: 2150 diff changeset	22	#include "variables.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	23
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	24	enum {
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	25	/* Max industries: 64000 (8 * 8000) */
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	26	INDUSTRY_POOL_BLOCK_SIZE_BITS = 3, /* In bits, so (1 << 3) == 8 */
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	27	INDUSTRY_POOL_MAX_BLOCKS = 8000,
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	28	};
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	29
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	30	/**
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	31	* Called if a new block is added to the industry-pool
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	32	*/
2817 cdf488223c23 (svn r3365) Staticise 36 functions tron parents: 2737 diff changeset	33	static void IndustryPoolNewBlock(uint start_item)
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	34	{
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	35	Industry *i;
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	36
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	37	FOR_ALL_INDUSTRIES_FROM(i, start_item) i->index = start_item++;
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	38	}
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	39
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	40	/* Initialize the industry-pool */
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	41	MemoryPool _industry_pool = { "Industry", INDUSTRY_POOL_MAX_BLOCKS, INDUSTRY_POOL_BLOCK_SIZE_BITS, sizeof(Industry), &IndustryPoolNewBlock, 0, 0, NULL };
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	42
2630 7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	43	static byte _industry_sound_ctr;
7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	44	static TileIndex _industry_sound_tile;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	45
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	46	void ShowIndustryViewWindow(int industry);
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	47	void BuildOilRig(TileIndex tile);
37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	48	void DeleteOilRig(TileIndex tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	49
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	50	typedef struct DrawIndustryTileStruct {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	51	uint32 sprite_1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	52	uint32 sprite_2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	53
2653 b1945642bf27 (svn r3195) Use bitfields instead of explicit shifting/masking tron parents: 2639 diff changeset	54	byte subtile_x:4;
b1945642bf27 (svn r3195) Use bitfields instead of explicit shifting/masking tron parents: 2639 diff changeset	55	byte subtile_y:4;
b1945642bf27 (svn r3195) Use bitfields instead of explicit shifting/masking tron parents: 2639 diff changeset	56	byte width:4;
b1945642bf27 (svn r3195) Use bitfields instead of explicit shifting/masking tron parents: 2639 diff changeset	57	byte height:4;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	58	byte dz;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	59	byte proc;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	60	} DrawIndustryTileStruct;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	61
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	62
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	63	typedef struct DrawIndustrySpec1Struct {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	64	byte x;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	65	byte image_1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	66	byte image_2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	67	byte image_3;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	68	} DrawIndustrySpec1Struct;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	69
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	70	typedef struct DrawIndustrySpec4Struct {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	71	byte image_1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	72	byte image_2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	73	byte image_3;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	74	} DrawIndustrySpec4Struct;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	75
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	76	typedef struct IndustryTileTable {
909 65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	77	TileIndexDiffC ti;
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	78	IndustryGfx gfx;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	79	} IndustryTileTable;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	80
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	81	typedef struct IndustrySpec {
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	82	const IndustryTileTable const table;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	83	byte num_table;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	84	byte a,b,c;
3344 fc86351d4641 (svn r4128) - CodeChange: Add proper semantics for CargoID for such variables instead of using the general byte-type. Darkvater parents: 3338 diff changeset	85	CargoID produced_cargo[2];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	86	byte production_rate[2];
3344 fc86351d4641 (svn r4128) - CodeChange: Add proper semantics for CargoID for such variables instead of using the general byte-type. Darkvater parents: 3338 diff changeset	87	CargoID accepts_cargo[3];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	88	byte check_proc;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	89	} IndustrySpec;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	90
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	91	#include "table/industry_land.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	92	#include "table/build_industry.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	93
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	94
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	95
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	96	static const IndustryType _industry_close_mode[IT_END] = {
3496 0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	97	/* COAL_MINE */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	98	/* POWER_STATION */ INDUSTRYLIFE_NOT_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	99	/* SAWMILL */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	100	/* FOREST */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	101	/* OIL_REFINERY */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	102	/* OIL_RIG */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	103	/* FACTORY */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	104	/* PRINTING_WORKS */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	105	/* STEEL_MILL */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	106	/* FARM */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	107	/* COPPER_MINE */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	108	/* OIL_WELL */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	109	/* BANK */ INDUSTRYLIFE_NOT_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	110	/* FOOD_PROCESS */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	111	/* PAPER_MILL */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	112	/* GOLD_MINE */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	113	/* BANK_2, */ INDUSTRYLIFE_NOT_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	114	/* DIAMOND_MINE */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	115	/* IRON_MINE */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	116	/* FRUIT_PLANTATION */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	117	/* RUBBER_PLANTATION */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	118	/* WATER_SUPPLY */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	119	/* WATER_TOWER */ INDUSTRYLIFE_NOT_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	120	/* FACTORY_2 */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	121	/* FARM_2 */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	122	/* LUMBER_MILL */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	123	/* COTTON_CANDY */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	124	/* CANDY_FACTORY */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	125	/* BATTERY_FARM */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	126	/* COLA_WELLS */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	127	/* TOY_SHOP */ INDUSTRYLIFE_NOT_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	128	/* TOY_FACTORY */ INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	129	/* PLASTIC_FOUNTAINS */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	130	/* FIZZY_DRINK_FACTORY */INDUSTRYLIFE_CLOSABLE,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	131	/* BUBBLE_GENERATOR */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	132	/* TOFFEE_QUARRY */ INDUSTRYLIFE_PRODUCTION,
0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	133	/* SUGAR_MINE */ INDUSTRYLIFE_PRODUCTION
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	134	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	135
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	136	static const StringID _industry_prod_up_strings[IT_END] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	137	STR_4836_NEW_COAL_SEAM_FOUND_AT,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	138	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	139	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	140	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	141	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	142	STR_4837_NEW_OIL_RESERVES_FOUND,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	143	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	144	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	145	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	146	STR_4838_IMPROVED_FARMING_METHODS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	147	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	148	STR_4837_NEW_OIL_RESERVES_FOUND,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	149	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	150	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	151	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	152	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	153	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	154	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	155	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	156	STR_4838_IMPROVED_FARMING_METHODS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	157	STR_4838_IMPROVED_FARMING_METHODS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	158	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	159	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	160	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	161	STR_4838_IMPROVED_FARMING_METHODS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	162	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	163	STR_4838_IMPROVED_FARMING_METHODS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	164	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	165	STR_4838_IMPROVED_FARMING_METHODS,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	166	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	167	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	168	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	169	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	170	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	171	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	172	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	173	STR_4835_INCREASES_PRODUCTION,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	174	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	175
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	176	static const StringID _industry_prod_down_strings[IT_END] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	177	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	178	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	179	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	180	STR_483A_INSECT_INFESTATION_CAUSES,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	181	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	182	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	183	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	184	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	185	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	186	STR_483A_INSECT_INFESTATION_CAUSES,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	187	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	188	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	189	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	190	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	191	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	192	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	193	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	194	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	195	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	196	STR_483A_INSECT_INFESTATION_CAUSES,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	197	STR_483A_INSECT_INFESTATION_CAUSES,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	198	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	199	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	200	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	201	STR_483A_INSECT_INFESTATION_CAUSES,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	202	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	203	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	204	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	205	STR_483A_INSECT_INFESTATION_CAUSES,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	206	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	207	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	208	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	209	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	210	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	211	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	212	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	213	STR_4839_PRODUCTION_DOWN_BY_50,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	214	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	215
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	216	static const StringID _industry_close_strings[IT_END] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	217	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	218	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	219	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	220	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	221	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	222	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	223	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	224	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	225	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	226	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	227	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	228	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	229	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	230	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	231	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	232	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	233	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	234	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	235	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	236	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	237	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	238	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	239	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	240	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	241	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	242	STR_4834_LACK_OF_NEARBY_TREES_CAUSES,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	243	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	244	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	245	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	246	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	247	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	248	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	249	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	250	STR_4833_SUPPLY_PROBLEMS_CAUSE_TO,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	251	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	252	STR_4832_ANNOUNCES_IMMINENT_CLOSURE,
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	253	STR_4832_ANNOUNCES_IMMINENT_CLOSURE
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	254	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	255
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	256	/**
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	257	* Retrieve the type for this industry. Although it is accessed by a tile,
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	258	* it will return the general type of industry, and not the sprite index
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	259	* as would do GetIndustryGfx.
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	260	* The same information can be accessed by looking at Industry->type
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	261	* @param tile that is queried
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	262	* @pre IsTileType(tile, MP_INDUSTRY)
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	263	* @return general type for this industry, as defined in industry.h
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	264	**/
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	265	IndustryType GetIndustryType(TileIndex tile)
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	266	{
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	267	IndustryGfx this_type = GetIndustryGfx(tile);
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	268	IndustryType iloop;
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	269
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	270	assert(IsTileType(tile, MP_INDUSTRY));
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	271
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	272	for (iloop = IT_COAL_MINE; iloop < IT_END; iloop += 1) {
3545 b08ce1bbb589 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come belugas parents: 3538 diff changeset	273	if (IS_BYTE_INSIDE(this_type, industry_gfx_Solver[iloop].MinGfx,
b08ce1bbb589 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come belugas parents: 3538 diff changeset	274	industry_gfx_Solver[iloop].MaxGfx)) {
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	275	return iloop;
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	276	}
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	277	}
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	278
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	279	return IT_INVALID; //we have not found equivalent, whatever the reason
92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	280	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	281
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	282	static void IndustryDrawSugarMine(const TileInfo *ti)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	283	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	284	const DrawIndustrySpec1Struct *d;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	285	uint32 image;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	286
3321 4061bfef1830 (svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built tron parents: 3320 diff changeset	287	if (!IsIndustryCompleted(ti->tile)) return;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	288
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	289	d = &_draw_industry_spec1[_m[ti->tile].m3];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	290
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	291	AddChildSpriteScreen(SPR_IT_SUGAR_MINE_SIEVE + d->image_1, d->x, 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	292
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	293	image = d->image_2;
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	294	if (image != 0) AddChildSpriteScreen(SPR_IT_SUGAR_MINE_CLOUDS + image - 1, 8, 41);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	295
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	296	image = d->image_3;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	297	if (image != 0) {
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	298	AddChildSpriteScreen(SPR_IT_SUGAR_MINE_PILE + image - 1,
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	299	_drawtile_proc1_x[image - 1], _drawtile_proc1_y[image - 1]);
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	300	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	301	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	302
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	303	static void IndustryDrawToffeeQuarry(const TileInfo *ti)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	304	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	305	int x = 0;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	306
3321 4061bfef1830 (svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built tron parents: 3320 diff changeset	307	if (IsIndustryCompleted(ti->tile)) {
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	308	x = _industry_anim_offs[_m[ti->tile].m3];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	309	if ( (byte)x == 0xFF)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	310	x = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	311	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	312
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	313	AddChildSpriteScreen(SPR_IT_TOFFEE_QUARRY_SHOVEL, 22 - x, 24 + x);
235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	314	AddChildSpriteScreen(SPR_IT_TOFFEE_QUARRY_TOFFEE, 6, 14);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	315	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	316
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	317	static void IndustryDrawBubbleGenerator( const TileInfo *ti)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	318	{
3321 4061bfef1830 (svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built tron parents: 3320 diff changeset	319	if (IsIndustryCompleted(ti->tile)) {
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	320	AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_BUBBLE, 5, _industry_anim_offs_2[_m[ti->tile].m3]);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	321	} else {
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	322	AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_SPRING, 3, 67);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	323	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	324	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	325
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	326	static void IndustryDrawToyFactory(const TileInfo *ti)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	327	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	328	const DrawIndustrySpec4Struct *d;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	329
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	330	d = &_industry_anim_offs_3[_m[ti->tile].m3];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	331
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	332	if (d->image_1 != 0xFF) {
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	333	AddChildSpriteScreen(SPR_IT_TOY_FACTORY_CLAY, 50 - d->image_1 * 2, 96 + d->image_1);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	334	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	335
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	336	if (d->image_2 != 0xFF) {
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	337	AddChildSpriteScreen(SPR_IT_TOY_FACTORY_ROBOT, 16 - d->image_2 * 2, 100 + d->image_2);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	338	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	339
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	340	AddChildSpriteScreen(SPR_IT_TOY_FACTORY_STAMP, 7, d->image_3);
235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	341	AddChildSpriteScreen(SPR_IT_TOY_FACTORY_STAMP_HOLDER, 0, 42);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	342	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	343
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	344	static void IndustryDrawCoalPlantSparks(const TileInfo *ti)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	345	{
3321 4061bfef1830 (svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built tron parents: 3320 diff changeset	346	if (IsIndustryCompleted(ti->tile)) {
4061bfef1830 (svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built tron parents: 3320 diff changeset	347	uint image = GB(_m[ti->tile].m1, 2, 5);
4061bfef1830 (svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built tron parents: 3320 diff changeset	348
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	349	if (image != 0 && image < 7) {
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	350	AddChildSpriteScreen(image + SPR_IT_POWER_PLANT_TRANSFORMERS,
235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	351	_coal_plant_sparks_x[image - 1],
235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	352	_coal_plant_sparks_y[image - 1]
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	353	);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	354	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	355	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	356	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	357
2436 7d5df545bd5d (svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters Darkvater parents: 2360 diff changeset	358	typedef void IndustryDrawTileProc(const TileInfo *ti);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	359	static IndustryDrawTileProc * const _industry_draw_tile_procs[5] = {
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	360	IndustryDrawSugarMine,
235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	361	IndustryDrawToffeeQuarry,
235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	362	IndustryDrawBubbleGenerator,
235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	363	IndustryDrawToyFactory,
235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	364	IndustryDrawCoalPlantSparks,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	365	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	366
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	367	static void DrawTile_Industry(TileInfo *ti)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	368	{
2630 7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	369	const Industry* ind;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	370	const DrawIndustryTileStruct *dits;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	371	byte z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	372	uint32 image, ormod;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	373
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	374	/* Pointer to industry */
3314 6aaeba4b92e8 (svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile tron parents: 3296 diff changeset	375	ind = GetIndustryByTile(ti->tile);
3326 00cf690a7fe1 (svn r4092) CodeChange : Named sprites instead of magic numbers plus create/use helper macro/enum for recoloring scheme belugas parents: 3321 diff changeset	376	ormod = GENERAL_SPRITE_COLOR(ind->color_map);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	377
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	378	/* Retrieve pointer to the draw industry tile struct */
3495 6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	379	dits = &_industry_draw_tile_data[GetIndustryGfx(ti->tile) << 2 \| GetIndustryConstructionStage(ti->tile)];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	380
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	381	image = dits->sprite_1;
2187 a0e206ce9fbf (svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers celestar parents: 2186 diff changeset	382	if (image & PALETTE_MODIFIER_COLOR && (image & PALETTE_SPRITE_MASK) == 0)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	383	image \|= ormod;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	384
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	385	z = ti->z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	386	/* Add bricks below the industry? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	387	if (ti->tileh & 0xF) {
2535 149921ee5e27 (svn r3064) Replace some numbers by sprite names tron parents: 2498 diff changeset	388	AddSortableSpriteToDraw(SPR_FOUNDATION_BASE + (ti->tileh & 0xF), ti->x, ti->y, 16, 16, 7, z);
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	389	AddChildSpriteScreen(image, 31, 1);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	390	z += 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	391	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	392	/* Else draw regular ground */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	393	DrawGroundSprite(image);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	394	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	395
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	396	/* Add industry on top of the ground? */
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	397	image = dits->sprite_2;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	398	if (image != 0) {
2187 a0e206ce9fbf (svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers celestar parents: 2186 diff changeset	399	if (image & PALETTE_MODIFIER_COLOR && (image & PALETTE_SPRITE_MASK) == 0)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	400	image \|= ormod;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	401
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	402	if (_display_opt & DO_TRANS_BUILDINGS) MAKE_TRANSPARENT(image);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	403
c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	404	AddSortableSpriteToDraw(image,
2653 b1945642bf27 (svn r3195) Use bitfields instead of explicit shifting/masking tron parents: 2639 diff changeset	405	ti->x + dits->subtile_x,
b1945642bf27 (svn r3195) Use bitfields instead of explicit shifting/masking tron parents: 2639 diff changeset	406	ti->y + dits->subtile_y,
b1945642bf27 (svn r3195) Use bitfields instead of explicit shifting/masking tron parents: 2639 diff changeset	407	dits->width + 1,
b1945642bf27 (svn r3195) Use bitfields instead of explicit shifting/masking tron parents: 2639 diff changeset	408	dits->height + 1,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	409	dits->dz,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	410	z);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	411
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	412	if (_display_opt & DO_TRANS_BUILDINGS) return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	413	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	414
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	415	{
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	416	int proc = dits->proc - 1;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	417	if (proc >= 0) _industry_draw_tile_procs[proc](ti);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	418	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	419	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	420
2537 5e4ca74e995a (svn r3066) Constify the parameter of GetSlopeZ_() tron* parents: 2535 diff changeset	421	static uint GetSlopeZ_Industry(const TileInfo* ti)
5e4ca74e995a (svn r3066) Constify the parameter of GetSlopeZ_() tron* parents: 2535 diff changeset	422	{
3282 d026008a8f7c (svn r3996) -Fix: Slope and height information returned for some tile types is wrong tron parents: 3222 diff changeset	423	return ti->z + (ti->tileh == 0 ? 0 : 8);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	424	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	425
3418 ec9003ebf933 (svn r4242) Pass TileIndex and slope to GetSlopeTileh_() instead of TileInfo tron* parents: 3379 diff changeset	426	static uint GetSlopeTileh_Industry(TileIndex tile, uint tileh)
2548 49c8a096033f (svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes tron parents: 2537 diff changeset	427	{
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 7 diff changeset	428	return 0;
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 7 diff changeset	429	}
d177340ed556 (svn r40) Final slope graphics fix dominik parents: 7 diff changeset	430
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	431	static void GetAcceptedCargo_Industry(TileIndex tile, AcceptedCargo ac)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	432	{
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	433	IndustryGfx gfx = GetIndustryGfx(tile);
2598 d69238b81415 (svn r3135) Use symbolic names in the tables, which hold the information about accepted goods of industry tiles, instead of magic numbers tron parents: 2549 diff changeset	434	CargoID a;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	435
3494 ba64f1689870 (svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections celestar parents: 3491 diff changeset	436	a = _industry_section_accepts_1[gfx];
2598 d69238b81415 (svn r3135) Use symbolic names in the tables, which hold the information about accepted goods of industry tiles, instead of magic numbers tron parents: 2549 diff changeset	437	if (a != CT_INVALID) ac[a] = (a == 0) ? 1 : 8;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	438
3494 ba64f1689870 (svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections celestar parents: 3491 diff changeset	439	a = _industry_section_accepts_2[gfx];
2598 d69238b81415 (svn r3135) Use symbolic names in the tables, which hold the information about accepted goods of industry tiles, instead of magic numbers tron parents: 2549 diff changeset	440	if (a != CT_INVALID) ac[a] = 8;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	441
3494 ba64f1689870 (svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections celestar parents: 3491 diff changeset	442	a = _industry_section_accepts_3[gfx];
2598 d69238b81415 (svn r3135) Use symbolic names in the tables, which hold the information about accepted goods of industry tiles, instead of magic numbers tron parents: 2549 diff changeset	443	if (a != CT_INVALID) ac[a] = 8;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	444	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	445
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	446	static void GetTileDesc_Industry(TileIndex tile, TileDesc *td)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	447	{
3314 6aaeba4b92e8 (svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile tron parents: 3296 diff changeset	448	const Industry* i = GetIndustryByTile(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	449
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	450	td->owner = i->owner;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	451	td->str = STR_4802_COAL_MINE + i->type;
3321 4061bfef1830 (svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built tron parents: 3320 diff changeset	452	if (!IsIndustryCompleted(tile)) {
534 306bc86eb23e (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	453	SetDParamX(td->dparam, 0, td->str);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	454	td->str = STR_2058_UNDER_CONSTRUCTION;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	455	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	456	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	457
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	458	static int32 ClearTile_Industry(TileIndex tile, byte flags)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	459	{
3314 6aaeba4b92e8 (svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile tron parents: 3296 diff changeset	460	Industry* i = GetIndustryByTile(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	461
149 5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 131 diff changeset	462	/* * water can destroy industries
5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 131 diff changeset	463	* in editor you can bulldoze industries
5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 131 diff changeset	464	* with magic_bulldozer cheat you can destroy industries
5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 131 diff changeset	465	* (area around OILRIG is water, so water shouldn't flood it
5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 131 diff changeset	466	*/
5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 131 diff changeset	467	if ((_current_player != OWNER_WATER && _game_mode != GM_EDITOR &&
5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 131 diff changeset	468	!_cheats.magic_bulldozer.value) \|\|
5f7d4b21df01 (svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs darkvater parents: 131 diff changeset	469	(_current_player == OWNER_WATER && i->type == IT_OIL_RIG) ) {
534 306bc86eb23e (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	470	SetDParam(0, STR_4802_COAL_MINE + i->type);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	471	return_cmd_error(STR_4800_IN_THE_WAY);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	472	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	473
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	474	if (flags & DC_EXEC) DeleteIndustry(i);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	475	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	476	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	477
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	478
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	479	static const byte _industry_min_cargo[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	480	5, 5, 5, 30, 5, 5, 5, 5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	481	5, 5, 5, 5, 2, 5, 5, 5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	482	5, 5, 5, 15, 15, 5, 5, 5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	483	5, 5, 30, 5, 30, 5, 5, 5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	484	5, 5, 5, 5, 5,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	485	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	486
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	487	static void TransportIndustryGoods(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	488	{
3314 6aaeba4b92e8 (svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile tron parents: 3296 diff changeset	489	Industry* i = GetIndustryByTile(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	490	uint cw, am;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	491
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	492	cw = min(i->cargo_waiting[0], 255);
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	493	if (cw > _industry_min_cargo[i->type]/* && i->produced_cargo[0] != 0xFF*/) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	494	i->cargo_waiting[0] -= cw;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	495
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	496	/* fluctuating economy? */
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	497	if (_economy.fluct <= 0) cw = (cw + 1) / 2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	498
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	499	i->last_mo_production[0] += cw;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	500
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	501	am = MoveGoodsToStation(i->xy, i->width, i->height, i->produced_cargo[0], cw);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	502	i->last_mo_transported[0] += am;
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	503	if (am != 0) {
3494 ba64f1689870 (svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections celestar parents: 3491 diff changeset	504	uint newgfx = _industry_produce_section[GetIndustryGfx(tile)];
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	505
da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	506	if (newgfx != 0xFF) {
3495 6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	507	ResetIndustryConstructionStage(tile);
6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	508	SetIndustryCompleted(tile, true);
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	509	SetIndustryGfx(tile, newgfx);
da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	510	MarkTileDirtyByTile(tile);
da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	511	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	512	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	513	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	514
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	515	cw = min(i->cargo_waiting[1], 255);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	516	if (cw > _industry_min_cargo[i->type]) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	517	i->cargo_waiting[1] -= cw;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	518
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	519	if (_economy.fluct <= 0) cw = (cw + 1) / 2;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	520
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	521	i->last_mo_production[1] += cw;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	522
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	523	am = MoveGoodsToStation(i->xy, i->width, i->height, i->produced_cargo[1], cw);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	524	i->last_mo_transported[1] += am;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	525	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	526	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	527
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	528
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	529	static void AnimateTile_Industry(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	530	{
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	531	byte m;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	532
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	533	switch (GetIndustryGfx(tile)) {
3545 b08ce1bbb589 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come belugas parents: 3538 diff changeset	534	case GFX_SUGAR_MINE_SIEVE:
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	535	if ((_tick_counter & 1) == 0) {
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	536	m = _m[tile].m3 + 1;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	537
2952 58522ed8f0f1 (svn r3511) More whitespace ([FS#46] by Rubidium) tron parents: 2868 diff changeset	538	switch (m & 7) {
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	539	case 2: SndPlayTileFx(SND_2D_RIP_2, tile); break;
625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	540	case 6: SndPlayTileFx(SND_29_RIP, tile); break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	541	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	542
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	543	if (m >= 96) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	544	m = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	545	DeleteAnimatedTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	546	}
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	547	_m[tile].m3 = m;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	548
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	549	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	550	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	551	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	552
3545 b08ce1bbb589 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come belugas parents: 3538 diff changeset	553	case GFX_TOFFEE_QUARY:
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	554	if ((_tick_counter & 3) == 0) {
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	555	m = _m[tile].m3;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	556
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	557	if (_industry_anim_offs[m] == 0xFF) {
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	558	SndPlayTileFx(SND_30_CARTOON_SOUND, tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	559	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	560
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	561	if (++m >= 70) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	562	m = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	563	DeleteAnimatedTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	564	}
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	565	_m[tile].m3 = m;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	566
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	567	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	568	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	569	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	570
3545 b08ce1bbb589 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come belugas parents: 3538 diff changeset	571	case GFX_BUBBLE_CATCHER:
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	572	if ((_tick_counter&1) == 0) {
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	573	m = _m[tile].m3;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	574
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	575	if (++m >= 40) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	576	m = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	577	DeleteAnimatedTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	578	}
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	579	_m[tile].m3 = m;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	580
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	581	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	582	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	583	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	584
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	585	// Sparks on a coal plant
3545 b08ce1bbb589 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come belugas parents: 3538 diff changeset	586	case GFX_POWERPLANT_SPARKS:
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	587	if ((_tick_counter & 3) == 0) {
2360 4e4ebe18e448 (svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing. tron parents: 2260 diff changeset	588	m = _m[tile].m1;
2663 e5a3df7f225a (svn r3205) Some more uses for GB/SB tron parents: 2653 diff changeset	589	if (GB(m, 2, 5) == 6) {
e5a3df7f225a (svn r3205) Some more uses for GB/SB tron parents: 2653 diff changeset	590	SB(_m[tile].m1, 2, 5, 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	591	DeleteAnimatedTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	592	} else {
2360 4e4ebe18e448 (svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing. tron parents: 2260 diff changeset	593	_m[tile].m1 = m + (1<<2);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	594	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	595	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	596	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	597	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	598
3545 b08ce1bbb589 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come belugas parents: 3538 diff changeset	599	case GFX_TOY_FACTORY:
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	600	if ((_tick_counter & 1) == 0) {
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	601	m = _m[tile].m3 + 1;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	602
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	603	if (m == 1) {
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	604	SndPlayTileFx(SND_2C_MACHINERY, tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	605	} else if (m == 23) {
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	606	SndPlayTileFx(SND_2B_COMEDY_HIT, tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	607	} else if (m == 28) {
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	608	SndPlayTileFx(SND_2A_EXTRACT_AND_POP, tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	609	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	610
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	611	if (m >= 50) {
750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	612	int n = GetIndustryAnimationLoop(tile) + 1;
750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	613	m = 0;
750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	614	if (n >= 8) {
750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	615	n = 0;
750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	616	DeleteAnimatedTile(tile);
750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	617	}
750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	618	SetIndustryAnimationLoop(tile, n);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	619	}
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	620	_m[tile].m3 = m;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	621	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	622	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	623	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	624
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	625	case 148: case 149: case 150: case 151:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	626	case 152: case 153: case 154: case 155:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	627	if ((_tick_counter & 3) == 0) {
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	628	IndustryGfx gfx = GetIndustryGfx(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	629
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	630	gfx = (gfx < 155) ? gfx + 1 : 148;
da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	631	SetIndustryGfx(tile, gfx);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	632	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	633	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	634	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	635
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	636	case 30: case 31: case 32:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	637	if ((_tick_counter & 7) == 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	638	bool b = CHANCE16(1,7);
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	639	IndustryGfx gfx = GetIndustryGfx(tile);
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	640
da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	641	m = GB(_m[tile].m1, 0, 2) + 1;
da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	642	if (m == 4 && (m = 0, ++gfx) == 32 + 1 && (gfx = 30, b)) {
2360 4e4ebe18e448 (svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing. tron parents: 2260 diff changeset	643	_m[tile].m1 = 0x83;
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	644	SetIndustryGfx(tile, 29);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	645	DeleteAnimatedTile(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	646	} else {
2663 e5a3df7f225a (svn r3205) Some more uses for GB/SB tron parents: 2653 diff changeset	647	SB(_m[tile].m1, 0, 2, m);
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	648	SetIndustryGfx(tile, gfx);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	649	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	650	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	651	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	652	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	653
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	654	case 88:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	655	case 48:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	656	case 1: {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	657	int state = _tick_counter & 0x7FF;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	658
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	659	if ((state -= 0x400) < 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	660	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	661
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	662	if (state < 0x1A0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	663	if (state < 0x20 \|\| state >= 0x180) {
2360 4e4ebe18e448 (svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing. tron parents: 2260 diff changeset	664	if (!(_m[tile].m1 & 0x40)) {
4e4ebe18e448 (svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing. tron parents: 2260 diff changeset	665	_m[tile].m1 \|= 0x40;
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	666	SndPlayTileFx(SND_0B_MINING_MACHINERY, tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	667	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	668	if (state & 7)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	669	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	670	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	671	if (state & 3)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	672	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	673	}
2360 4e4ebe18e448 (svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing. tron parents: 2260 diff changeset	674	m = (_m[tile].m1 + 1) \| 0x40;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	675	if (m > 0xC2) m = 0xC0;
2360 4e4ebe18e448 (svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing. tron parents: 2260 diff changeset	676	_m[tile].m1 = m;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	677	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	678	} else if (state >= 0x200 && state < 0x3A0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	679	int i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	680	i = (state < 0x220 \|\| state >= 0x380) ? 7 : 3;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	681	if (state & i)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	682	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	683
2360 4e4ebe18e448 (svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing. tron parents: 2260 diff changeset	684	m = (_m[tile].m1 & 0xBF) - 1;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	685	if (m < 0x80) m = 0x82;
2360 4e4ebe18e448 (svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing. tron parents: 2260 diff changeset	686	_m[tile].m1 = m;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	687	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	688	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	689	} break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	690	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	691	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	692
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	693	static void CreateIndustryEffectSmoke(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	694	{
3094 e8318bbdbee5 (svn r3683) Get rid of another FindLandscapeHeight() tron parents: 3047 diff changeset	695	uint tileh;
e8318bbdbee5 (svn r3683) Get rid of another FindLandscapeHeight() tron parents: 3047 diff changeset	696	uint x;
e8318bbdbee5 (svn r3683) Get rid of another FindLandscapeHeight() tron parents: 3047 diff changeset	697	uint y;
e8318bbdbee5 (svn r3683) Get rid of another FindLandscapeHeight() tron parents: 3047 diff changeset	698	uint z;
e8318bbdbee5 (svn r3683) Get rid of another FindLandscapeHeight() tron parents: 3047 diff changeset	699
e8318bbdbee5 (svn r3683) Get rid of another FindLandscapeHeight() tron parents: 3047 diff changeset	700	tileh = GetTileSlope(tile, &z);
e8318bbdbee5 (svn r3683) Get rid of another FindLandscapeHeight() tron parents: 3047 diff changeset	701	x = TileX(tile) * TILE_SIZE;
e8318bbdbee5 (svn r3683) Get rid of another FindLandscapeHeight() tron parents: 3047 diff changeset	702	y = TileY(tile) * TILE_SIZE;
e8318bbdbee5 (svn r3683) Get rid of another FindLandscapeHeight() tron parents: 3047 diff changeset	703	CreateEffectVehicle(x + 15, y + 14, z + 59 + (tileh != 0 ? 8 : 0), EV_CHIMNEY_SMOKE);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	704	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	705
3495 6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	706	static void MakeIndustryTileBigger(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	707	{
3495 6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	708	byte cnt = GetIndustryConstructionCounter(tile) + 1;
6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	709	byte stage;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	710
3495 6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	711	if (cnt != 4) {
6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	712	SetIndustryConstructionCounter(tile, cnt);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	713	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	714	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	715
3495 6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	716	stage = GetIndustryConstructionStage(tile) + 1;
6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	717	SetIndustryConstructionCounter(tile, 0);
6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	718	SetIndustryConstructionStage(tile, stage);
6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	719	if (stage == 3) {
6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	720	SetIndustryCompleted(tile, true);
6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	721	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	722
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	723	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	724
3321 4061bfef1830 (svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built tron parents: 3320 diff changeset	725	if (!IsIndustryCompleted(tile)) return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	726
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	727	switch (GetIndustryGfx(tile)) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	728	case 8:
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	729	CreateIndustryEffectSmoke(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	730	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	731
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	732	case 24:
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	733	if (GetIndustryGfx(tile + TileDiffXY(0, 1)) == 24) BuildOilRig(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	734	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	735
3545 b08ce1bbb589 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come belugas parents: 3538 diff changeset	736	case GFX_TOY_FACTORY:
b08ce1bbb589 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come belugas parents: 3538 diff changeset	737	case GFX_BUBBLE_CATCHER:
b08ce1bbb589 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come belugas parents: 3538 diff changeset	738	case GFX_TOFFEE_QUARY:
2049 538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes. tron parents: 1981 diff changeset	739	_m[tile].m3 = 0;
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	740	SetIndustryAnimationLoop(tile, 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	741	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	742
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	743	case 148: case 149: case 150: case 151:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	744	case 152: case 153: case 154: case 155:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	745	AddAnimatedTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	746	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	747	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	748	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	749
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	750
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	751	static void TileLoopIndustry_BubbleGenerator(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	752	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	753	int dir;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	754	Vehicle *v;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	755	static const int8 _tileloop_ind_case_161[12] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	756	11, 0, -4, -14,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	757	-4, -10, -4, 1,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	758	49, 59, 60, 65,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	759	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	760
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	761	SndPlayTileFx(SND_2E_EXTRACT_AND_POP, tile);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	762
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	763	dir = Random() & 3;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	764
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	765	v = CreateEffectVehicleAbove(
3421 7968a4b5ff0a (svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE celestar parents: 3418 diff changeset	766	TileX(tile) * TILE_SIZE + _tileloop_ind_case_161[dir + 0],
7968a4b5ff0a (svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE celestar parents: 3418 diff changeset	767	TileY(tile) * TILE_SIZE + _tileloop_ind_case_161[dir + 4],
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	768	_tileloop_ind_case_161[dir + 8],
1359 52782e5cf7c9 (svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle() tron* parents: 1335 diff changeset	769	EV_BUBBLE
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	770	);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	771
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	772	if (v != NULL) v->u.special.unk2 = dir;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	773	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	774
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	775	static void TileLoop_Industry(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	776	{
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	777	IndustryGfx newgfx;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	778
3321 4061bfef1830 (svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built tron parents: 3320 diff changeset	779	if (!IsIndustryCompleted(tile)) {
3495 6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	780	MakeIndustryTileBigger(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	781	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	782	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	783
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	784	if (_game_mode == GM_EDITOR) return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	785
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	786	TransportIndustryGoods(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	787
3494 ba64f1689870 (svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections celestar parents: 3491 diff changeset	788	newgfx = _industry_section_animation_next[GetIndustryGfx(tile)];
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	789	if (newgfx != 255) {
3495 6672c181ace4 (svn r4346) CodeChange : Add and Use Accessors to Industry's Stage and Counter construction. Removed last direct map access from Disaster_cmd.c as well. Based on work from Rubidium in tfc_newmap belugas parents: 3494 diff changeset	790	ResetIndustryConstructionStage(tile);
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	791	SetIndustryGfx(tile, newgfx);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	792	MarkTileDirtyByTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	793	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	794	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	795
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	796	#define SET_AND_ANIMATE(tile, a, b) { SetIndustryGfx(tile, a); _m[tile].m1 = b; AddAnimatedTile(tile); }
da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	797	#define SET_AND_UNANIMATE(tile, a, b) { SetIndustryGfx(tile, a); _m[tile].m1 = b; DeleteAnimatedTile(tile); }
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	798
3331 da6bbabbb6cc (svn r4108) Add [GS]etIndustryGfx() tron parents: 3326 diff changeset	799	switch (GetIndustryGfx(tile)) {
43 3b93861c5478 (svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel) dominik parents: 39 diff changeset	800	case 0x18: // coast line at oilrigs
3b93861c5478 (svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel) dominik parents: 39 diff changeset	801	case 0x19:
3b93861c5478 (svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel) dominik parents: 39 diff changeset	802	case 0x1A:
3b93861c5478 (svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel) dominik parents: 39 diff changeset	803	case 0x1B:
3b93861c5478 (svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel) dominik parents: 39 diff changeset	804	case 0x1C:
3b93861c5478 (svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel) dominik parents: 39 diff changeset	805	TileLoop_Water(tile);
3b93861c5478 (svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel) dominik parents: 39 diff changeset	806	break;
3b93861c5478 (svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel) dominik parents: 39 diff changeset	807
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	808	case 0:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	809	if (!(_tick_counter & 0x400) && CHANCE16(1,2))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	810	SET_AND_ANIMATE(tile,1,0x80);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	811	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	812
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	813	case 47:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	814	if (!(_tick_counter & 0x400) && CHANCE16(1,2))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	815	SET_AND_ANIMATE(tile,0x30,0x80);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	816	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	817
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	818	case 79:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	819	if (!(_tick_counter & 0x400) && CHANCE16(1,2))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	820	SET_AND_ANIMATE(tile,0x58,0x80);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	821	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	822
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	823	case 29:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	824	if (CHANCE16(1,6))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	825	SET_AND_ANIMATE(tile,0x1E,0x80);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	826	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	827
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	828	case 1:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	829	if (!(_tick_counter & 0x400))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	830	SET_AND_UNANIMATE(tile, 0, 0x83);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	831	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	832
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	833	case 48:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	834	if (!(_tick_counter & 0x400))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	835	SET_AND_UNANIMATE(tile, 0x2F, 0x83);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	836	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	837
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	838	case 88:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	839	if (!(_tick_counter & 0x400))
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	840	SET_AND_UNANIMATE(tile, 0x4F, 0x83);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	841	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	842
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	843	case 10:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	844	if (CHANCE16(1,3)) {
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	845	SndPlayTileFx(SND_0C_ELECTRIC_SPARK, tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	846	AddAnimatedTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	847	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	848	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	849
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	850	case 49:
3421 7968a4b5ff0a (svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE celestar parents: 3418 diff changeset	851	CreateEffectVehicleAbove(TileX(tile) * TILE_SIZE + 6, TileY(tile) * TILE_SIZE + 6, 43, EV_SMOKE);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	852	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	853
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	854
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	855	case 143: {
3314 6aaeba4b92e8 (svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile tron parents: 3296 diff changeset	856	Industry* i = GetIndustryByTile(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	857	if (i->was_cargo_delivered) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	858	i->was_cargo_delivered = false;
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	859	SetIndustryAnimationLoop(tile, 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	860	AddAnimatedTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	861	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	862	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	863	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	864
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	865	case 161:
3290 235df477f3ee (svn r4004) -CodeChange : Renaming sprites and functions belugas parents: 3282 diff changeset	866	TileLoopIndustry_BubbleGenerator(tile);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	867	break;
c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	868
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	869	case 165:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	870	AddAnimatedTile(tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	871	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	872
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	873	case 174:
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	874	if (CHANCE16(1, 3)) AddAnimatedTile(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	875	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	876	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	877	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	878
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	879
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	880	static void ClickTile_Industry(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	881	{
3314 6aaeba4b92e8 (svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile tron parents: 3296 diff changeset	882	ShowIndustryViewWindow(GetIndustryIndex(tile));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	883	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	884
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	885	static uint32 GetTileTrackStatus_Industry(TileIndex tile, TransportType mode)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	886	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	887	return 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	888	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	889
3344 fc86351d4641 (svn r4128) - CodeChange: Add proper semantics for CargoID for such variables instead of using the general byte-type. Darkvater parents: 3338 diff changeset	890	static void GetProducedCargo_Industry(TileIndex tile, CargoID *b)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	891	{
3314 6aaeba4b92e8 (svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile tron parents: 3296 diff changeset	892	const Industry* i = GetIndustryByTile(tile);
2630 7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	893
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	894	b[0] = i->produced_cargo[0];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	895	b[1] = i->produced_cargo[1];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	896	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	897
2436 7d5df545bd5d (svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters Darkvater parents: 2360 diff changeset	898	static void ChangeTileOwner_Industry(TileIndex tile, PlayerID old_player, PlayerID new_player)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	899	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	900	/* not used */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	901	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	902
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	903	void DeleteIndustry(Industry *i)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	904	{
919 544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	905	BEGIN_TILE_LOOP(tile_cur, i->width, i->height, i->xy);
1035 812f837ee03f (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1019 diff changeset	906	if (IsTileType(tile_cur, MP_INDUSTRY)) {
3314 6aaeba4b92e8 (svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile tron parents: 3296 diff changeset	907	if (GetIndustryIndex(tile_cur) == i->index) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	908	DoClearSquare(tile_cur);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	909	}
3338 7cff208f0446 (svn r4120) Use the new station functions where appropriate tron parents: 3331 diff changeset	910	} else if (IsTileType(tile_cur, MP_STATION) && IsOilRig(tile_cur)) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	911	DeleteOilRig(tile_cur);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	912	}
919 544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	913	END_TILE_LOOP(tile_cur, i->width, i->height, i->xy);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	914
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	915	i->xy = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	916	_industry_sort_dirty = true;
919 544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	917	DeleteSubsidyWithIndustry(i->index);
544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	918	DeleteWindowById(WC_INDUSTRY_VIEW, i->index);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	919	InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	920	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	921
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	922	static const byte _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	923
1048 8611c5c02dcb (svn r1549) Clean up some functions: tron parents: 1035 diff changeset	924	static bool IsBadFarmFieldTile(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	925	{
1214 8262981ac274 (svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int. tron parents: 1209 diff changeset	926	switch (GetTileType(tile)) {
3447 1c62c085638a (svn r4279) s/\<CL_/CLEAR_/ tron parents: 3440 diff changeset	927	case MP_CLEAR: return IsClearGround(tile, CLEAR_FIELDS) \|\| IsClearGround(tile, CLEAR_SNOW);
2955 24de69e236d2 (svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors. tron parents: 2952 diff changeset	928	case MP_TREES: return false;
24de69e236d2 (svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors. tron parents: 2952 diff changeset	929	default: return true;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	930	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	931	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	932
1048 8611c5c02dcb (svn r1549) Clean up some functions: tron parents: 1035 diff changeset	933	static bool IsBadFarmFieldTile2(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	934	{
1214 8262981ac274 (svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int. tron parents: 1209 diff changeset	935	switch (GetTileType(tile)) {
3447 1c62c085638a (svn r4279) s/\<CL_/CLEAR_/ tron parents: 3440 diff changeset	936	case MP_CLEAR: return IsClearGround(tile, CLEAR_SNOW);
2955 24de69e236d2 (svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors. tron parents: 2952 diff changeset	937	case MP_TREES: return false;
24de69e236d2 (svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors. tron parents: 2952 diff changeset	938	default: return true;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	939	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	940	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	941
3157 3f35e2d9c8e3 (svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends tron parents: 3144 diff changeset	942	static void SetupFarmFieldFence(TileIndex tile, int size, byte type, Axis direction)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	943	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	944	do {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	945	tile = TILE_MASK(tile);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	946
1035 812f837ee03f (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1019 diff changeset	947	if (IsTileType(tile, MP_CLEAR) \|\| IsTileType(tile, MP_TREES)) {
2979 3ddf7c78d469 (svn r3554) Add accessors for the field type and fences of clear tiles tron parents: 2955 diff changeset	948	byte or = type;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	949
2637 722dae65c4a8 (svn r3179) - RandomRange() and RandomTile() instead of home brewed versions tron parents: 2630 diff changeset	950	if (or == 1 && CHANCE16(1, 7)) or = 2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	951
3157 3f35e2d9c8e3 (svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends tron parents: 3144 diff changeset	952	if (direction == AXIS_X) {
3f35e2d9c8e3 (svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends tron parents: 3144 diff changeset	953	SetFenceSE(tile, or);
3f35e2d9c8e3 (svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends tron parents: 3144 diff changeset	954	} else {
2979 3ddf7c78d469 (svn r3554) Add accessors for the field type and fences of clear tiles tron parents: 2955 diff changeset	955	SetFenceSW(tile, or);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	956	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	957	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	958
3157 3f35e2d9c8e3 (svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends tron parents: 3144 diff changeset	959	tile += (direction == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	960	} while (--size);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	961	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	962
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	963	static void PlantFarmField(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	964	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	965	uint size_x, size_y;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	966	uint32 r;
2133 d7f582b7001d (svn r2643) Get rid of some unnecessary casts tron parents: 2085 diff changeset	967	uint count;
2979 3ddf7c78d469 (svn r3554) Add accessors for the field type and fences of clear tiles tron parents: 2955 diff changeset	968	uint counter;
3ddf7c78d469 (svn r3554) Add accessors for the field type and fences of clear tiles tron parents: 2955 diff changeset	969	uint field_type;
3ddf7c78d469 (svn r3554) Add accessors for the field type and fences of clear tiles tron parents: 2955 diff changeset	970	int type;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	971
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	972	if (_opt.landscape == LT_HILLY) {
3422 a6eba3443452 (svn r4249) -Codechange: Replace more occurences of 16 by TILE_SIZE and of 8 by TILE_HEIGHT. Reverted one change from the previous commit because it was faulty celestar parents: 3421 diff changeset	973	if (GetTileZ(tile) + TILE_HEIGHT * 2 >= _opt.snow_line)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	974	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	975	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	976
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	977	/* determine field size */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	978	r = (Random() & 0x303) + 0x404;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	979	if (_opt.landscape == LT_HILLY) r += 0x404;
2150 f710b959b1c4 (svn r2660) Get rid of some more shifting/anding/casting tron parents: 2148 diff changeset	980	size_x = GB(r, 0, 8);
f710b959b1c4 (svn r2660) Get rid of some more shifting/anding/casting tron parents: 2148 diff changeset	981	size_y = GB(r, 8, 8);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	982
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	983	/* offset tile to match size */
1981 3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	984	tile -= TileDiffXY(size_x / 2, size_y / 2);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	985
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	986	/* check the amount of bad tiles */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	987	count = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	988	BEGIN_TILE_LOOP(cur_tile, size_x, size_y, tile)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	989	cur_tile = TILE_MASK(cur_tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	990	count += IsBadFarmFieldTile(cur_tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	991	END_TILE_LOOP(cur_tile, size_x, size_y, tile)
2133 d7f582b7001d (svn r2643) Get rid of some unnecessary casts tron parents: 2085 diff changeset	992	if (count * 2 >= size_x * size_y) return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	993
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	994	/* determine type of field */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	995	r = Random();
2979 3ddf7c78d469 (svn r3554) Add accessors for the field type and fences of clear tiles tron parents: 2955 diff changeset	996	counter = GB(r, 5, 3);
3ddf7c78d469 (svn r3554) Add accessors for the field type and fences of clear tiles tron parents: 2955 diff changeset	997	field_type = GB(r, 8, 8) * 9 >> 8;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	998
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	999	/* make field */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1000	BEGIN_TILE_LOOP(cur_tile, size_x, size_y, tile)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1001	cur_tile = TILE_MASK(cur_tile);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1002	if (!IsBadFarmFieldTile2(cur_tile)) {
3291 f45158e006d0 (svn r4007) Add a function to make a farm field tile tron parents: 3290 diff changeset	1003	MakeField(cur_tile, field_type);
2979 3ddf7c78d469 (svn r3554) Add accessors for the field type and fences of clear tiles tron parents: 2955 diff changeset	1004	SetClearCounter(cur_tile, counter);
3ddf7c78d469 (svn r3554) Add accessors for the field type and fences of clear tiles tron parents: 2955 diff changeset	1005	MarkTileDirtyByTile(cur_tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1006	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1007	END_TILE_LOOP(cur_tile, size_x, size_y, tile)
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1008
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1009	type = 3;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1010	if (_opt.landscape != LT_HILLY && _opt.landscape != LT_DESERT) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1011	type = _plantfarmfield_type[Random() & 0xF];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1012	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1013
3157 3f35e2d9c8e3 (svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends tron parents: 3144 diff changeset	1014	SetupFarmFieldFence(tile - TileDiffXY(1, 0), size_y, type, AXIS_Y);
3f35e2d9c8e3 (svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends tron parents: 3144 diff changeset	1015	SetupFarmFieldFence(tile - TileDiffXY(0, 1), size_x, type, AXIS_X);
3f35e2d9c8e3 (svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends tron parents: 3144 diff changeset	1016	SetupFarmFieldFence(tile + TileDiffXY(size_x - 1, 0), size_y, type, AXIS_Y);
3f35e2d9c8e3 (svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends tron parents: 3144 diff changeset	1017	SetupFarmFieldFence(tile + TileDiffXY(0, size_y - 1), size_x, type, AXIS_X);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1018	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1019
2548 49c8a096033f (svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes tron parents: 2537 diff changeset	1020	static void MaybePlantFarmField(const Industry* i)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1021	{
2549 5587f9a38563 (svn r3078) Some more stuff, which piled up: tron parents: 2548 diff changeset	1022	if (CHANCE16(1, 8)) {
5587f9a38563 (svn r3078) Some more stuff, which piled up: tron parents: 2548 diff changeset	1023	int x = i->width / 2 + Random() % 31 - 16;
5587f9a38563 (svn r3078) Some more stuff, which piled up: tron parents: 2548 diff changeset	1024	int y = i->height / 2 + Random() % 31 - 16;
5587f9a38563 (svn r3078) Some more stuff, which piled up: tron parents: 2548 diff changeset	1025	TileIndex tile = TileAddWrap(i->xy, x, y);
5587f9a38563 (svn r3078) Some more stuff, which piled up: tron parents: 2548 diff changeset	1026	if (tile != INVALID_TILE) PlantFarmField(tile);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1027	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1028	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1029
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1030	static void ChopLumberMillTrees(Industry *i)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1031	{
909 65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1032	static const TileIndexDiffC _chop_dir[] = {
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1033	{ 0, 1},
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1034	{ 1, 0},
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1035	{ 0, -1},
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1036	{-1, 0}
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1037	};
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1038
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	1039	TileIndex tile = i->xy;
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1040	int a;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1041
3321 4061bfef1830 (svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built tron parents: 3320 diff changeset	1042	if (!IsIndustryCompleted(tile)) return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1043
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1044	/* search outwards as a rectangular spiral */
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1045	for (a = 1; a != 41; a += 2) {
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1046	uint dir;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1047
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1048	for (dir = 0; dir != 4; dir++) {
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1049	int j = a;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1050
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1051	do {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1052	tile = TILE_MASK(tile);
1035 812f837ee03f (svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts tron parents: 1019 diff changeset	1053	if (IsTileType(tile, MP_TREES)) {
2498 3ed05caa4449 (svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants tron parents: 2493 diff changeset	1054	PlayerID old_player = _current_player;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1055	/* found a tree */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1056
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1057	_current_player = OWNER_NONE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1058	_industry_sound_ctr = 1;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1059	_industry_sound_tile = tile;
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	1060	SndPlayTileFx(SND_38_CHAINSAW, tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1061
3491 35d747bb5e82 (svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex tron parents: 3447 diff changeset	1062	DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
3379 50b253bb9819 (svn r4181) CodeChange : Replaced [G/S]etMapExtraBits by [G/S]etTropicZone. Although it was an accessor, nor his usage nor the values were clear. belugas parents: 3344 diff changeset	1063	SetTropicZone(tile, TROPICZONE_INVALID);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1064
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1065	i->cargo_waiting[0] = min(0xffff, i->cargo_waiting[0] + 45);
314 75fe42199623 (svn r320) -Fix: some last _current_player fixes truelight parents: 267 diff changeset	1066
75fe42199623 (svn r320) -Fix: some last _current_player fixes truelight parents: 267 diff changeset	1067	_current_player = old_player;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1068	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1069	}
909 65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1070	tile += ToTileIndexDiff(_chop_dir[dir]);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1071	} while (--j);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1072	}
1981 3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	1073	tile -= TileDiffXY(1, 1);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1074	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1075	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1076
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1077	static const byte _industry_sounds[37][2] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1078	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1079	{0},
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	1080	{1, SND_28_SAWMILL},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1081	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1082	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1083	{0},
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	1084	{1, SND_03_FACTORY_WHISTLE},
625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	1085	{1, SND_03_FACTORY_WHISTLE},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1086	{0},
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	1087	{3, SND_24_SHEEP},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1088	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1089	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1090	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1091	{0},
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	1092	{1, SND_28_SAWMILL},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1093	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1094	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1095	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1096	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1097	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1098	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1099	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1100	{0},
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	1101	{1, SND_03_FACTORY_WHISTLE},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1102	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1103	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1104	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1105	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1106	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1107	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1108	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1109	{0},
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	1110	{1, SND_33_PLASTIC_MINE},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1111	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1112	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1113	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1114	{0},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1115	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1116
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1117
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1118	static void ProduceIndustryGoods(Industry *i)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1119	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1120	uint32 r;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1121	uint num;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1122
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1123	/* play a sound? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1124	if ((i->counter & 0x3F) == 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1125	if (CHANCE16R(1,14,r) && (num=_industry_sounds[i->type][0]) != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1126	SndPlayTileFx(
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1127	_industry_sounds[i->type][1] + (((r >> 16) * num) >> 16),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1128	i->xy);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1129	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1130	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1131
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1132	i->counter--;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1133
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1134	/* produce some cargo */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1135	if ((i->counter & 0xFF) == 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1136	i->cargo_waiting[0] = min(0xffff, i->cargo_waiting[0] + i->production_rate[0]);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1137	i->cargo_waiting[1] = min(0xffff, i->cargo_waiting[1] + i->production_rate[1]);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1138
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1139	if (i->type == IT_FARM) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1140	MaybePlantFarmField(i);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1141	} else if (i->type == IT_LUMBER_MILL && (i->counter & 0x1FF) == 0) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1142	ChopLumberMillTrees(i);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1143	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1144	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1145	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1146
1093 4fdc46eaf423 (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1059 diff changeset	1147	void OnTick_Industry(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1148	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1149	Industry *i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1150
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1151	if (_industry_sound_ctr != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1152	_industry_sound_ctr++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1153
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1154	if (_industry_sound_ctr == 75) {
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	1155	SndPlayTileFx(SND_37_BALLOON_SQUEAK, _industry_sound_tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1156	} else if (_industry_sound_ctr == 160) {
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1157	_industry_sound_ctr = 0;
541 625227bb2a3d (svn r925) Use sound enums tron parents: 534 diff changeset	1158	SndPlayTileFx(SND_36_CARTOON_CRASH, _industry_sound_tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1159	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1160	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1161
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1162	if (_game_mode == GM_EDITOR) return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1163
830 36c1366367e4 (svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too truelight parents: 817 diff changeset	1164	FOR_ALL_INDUSTRIES(i) {
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1165	if (i->xy != 0) ProduceIndustryGoods(i);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1166	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1167	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1168
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1169
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	1170	static bool CheckNewIndustry_NULL(TileIndex tile, IndustryType type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1171	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1172	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1173	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1174
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	1175	static bool CheckNewIndustry_Forest(TileIndex tile, IndustryType type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1176	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1177	if (_opt.landscape == LT_HILLY) {
1335 a5f223b9f549 (svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters tron parents: 1320 diff changeset	1178	if (GetTileZ(tile) < _opt.snow_line + 16U) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1179	_error_message = STR_4831_FOREST_CAN_ONLY_BE_PLANTED;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1180	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1181	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1182	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1183	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1184	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1185
7 f2e623faa778 (svn r8) Fix: Automatic oil refinery generation in editor dominik parents: 0 diff changeset	1186	extern bool _ignore_restrictions;
f2e623faa778 (svn r8) Fix: Automatic oil refinery generation in editor dominik parents: 0 diff changeset	1187
1586 d179623e13c9 (svn r2090) CheckNewIndustry_Oilwell() -> CheckNewIndustry_Oil() since it was concerning oil rigs and oil rafineries, but specifically NOT oil wells. ;-) Documented that. pasky parents: 1373 diff changeset	1188	/* Oil Rig and Oil Refinery */
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	1189	static bool CheckNewIndustry_Oil(TileIndex tile, IndustryType type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1190	{
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1191	if (_game_mode == GM_EDITOR && _ignore_restrictions) return true;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1192	if (_game_mode == GM_EDITOR && type != IT_OIL_RIG) return true;
2868 9678db2d90e8 (svn r3416) - Fix: Disallow building an oil rig above sea level. peter1138 parents: 2817 diff changeset	1193	if ((type != IT_OIL_RIG \|\| TileHeight(tile) == 0) &&
3422 a6eba3443452 (svn r4249) -Codechange: Replace more occurences of 16 by TILE_SIZE and of 8 by TILE_HEIGHT. Reverted one change from the previous commit because it was faulty celestar parents: 3421 diff changeset	1194	DistanceFromEdge(TILE_ADDXY(tile, 1, 1)) < 16) return true;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1195
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1196	_error_message = STR_483B_CAN_ONLY_BE_POSITIONED;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1197	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1198	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1199
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	1200	static bool CheckNewIndustry_Farm(TileIndex tile, IndustryType type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1201	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1202	if (_opt.landscape == LT_HILLY) {
3422 a6eba3443452 (svn r4249) -Codechange: Replace more occurences of 16 by TILE_SIZE and of 8 by TILE_HEIGHT. Reverted one change from the previous commit because it was faulty celestar parents: 3421 diff changeset	1203	if (GetTileZ(tile) + TILE_HEIGHT * 2 >= _opt.snow_line) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1204	_error_message = STR_0239_SITE_UNSUITABLE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1205	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1206	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1207	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1208	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1209	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1210
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	1211	static bool CheckNewIndustry_Plantation(TileIndex tile, IndustryType type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1212	{
3379 50b253bb9819 (svn r4181) CodeChange : Replaced [G/S]etMapExtraBits by [G/S]etTropicZone. Although it was an accessor, nor his usage nor the values were clear. belugas parents: 3344 diff changeset	1213	if (GetTropicZone(tile) == TROPICZONE_DESERT) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1214	_error_message = STR_0239_SITE_UNSUITABLE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1215	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1216	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1217
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1218	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1219	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1220
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	1221	static bool CheckNewIndustry_Water(TileIndex tile, IndustryType type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1222	{
3379 50b253bb9819 (svn r4181) CodeChange : Replaced [G/S]etMapExtraBits by [G/S]etTropicZone. Although it was an accessor, nor his usage nor the values were clear. belugas parents: 3344 diff changeset	1223	if (GetTropicZone(tile) != TROPICZONE_DESERT) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1224	_error_message = STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1225	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1226	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1227
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1228	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1229	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1230
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	1231	static bool CheckNewIndustry_Lumbermill(TileIndex tile, IndustryType type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1232	{
3379 50b253bb9819 (svn r4181) CodeChange : Replaced [G/S]etMapExtraBits by [G/S]etTropicZone. Although it was an accessor, nor his usage nor the values were clear. belugas parents: 3344 diff changeset	1233	if (GetTropicZone(tile) != TROPICZONE_RAINFOREST) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1234	_error_message = STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1235	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1236	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1237	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1238	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1239
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	1240	static bool CheckNewIndustry_BubbleGen(TileIndex tile, IndustryType type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1241	{
2549 5587f9a38563 (svn r3078) Some more stuff, which piled up: tron parents: 2548 diff changeset	1242	return GetTileZ(tile) <= 32;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1243	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1244
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	1245	typedef bool CheckNewIndustryProc(TileIndex tile, IndustryType type);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1246	static CheckNewIndustryProc * const _check_new_industry_procs[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1247	CheckNewIndustry_NULL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1248	CheckNewIndustry_Forest,
1586 d179623e13c9 (svn r2090) CheckNewIndustry_Oilwell() -> CheckNewIndustry_Oil() since it was concerning oil rigs and oil rafineries, but specifically NOT oil wells. ;-) Documented that. pasky parents: 1373 diff changeset	1249	CheckNewIndustry_Oil,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1250	CheckNewIndustry_Farm,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1251	CheckNewIndustry_Plantation,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1252	CheckNewIndustry_Water,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1253	CheckNewIndustry_Lumbermill,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1254	CheckNewIndustry_BubbleGen,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1255	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1256
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	1257	static bool CheckSuitableIndustryPos(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1258	{
926 a6d140a6a4de (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron parents: 919 diff changeset	1259	uint x = TileX(tile);
a6d140a6a4de (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY] tron parents: 919 diff changeset	1260	uint y = TileY(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1261
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1262	if (x < 2 \|\| y < 2 \|\| x > MapMaxX() - 3 \|\| y > MapMaxY() - 3) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1263	_error_message = STR_0239_SITE_UNSUITABLE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1264	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1265	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1266
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1267	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1268	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1269
2630 7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	1270	static const Town* CheckMultipleIndustryInTown(TileIndex tile, int type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1271	{
2630 7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	1272	const Town* t;
7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	1273	const Industry* i;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1274
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1275	t = ClosestTownFromTile(tile, (uint)-1);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1276
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1277	if (_patches.multiple_industry_per_town) return t;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1278
830 36c1366367e4 (svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too truelight parents: 817 diff changeset	1279	FOR_ALL_INDUSTRIES(i) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1280	if (i->xy != 0 &&
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1281	i->type == (byte)type &&
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1282	i->town == t) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1283	_error_message = STR_0287_ONLY_ONE_ALLOWED_PER_TOWN;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1284	return NULL;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1285	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1286	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1287
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1288	return t;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1289	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1290
3494 ba64f1689870 (svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections celestar parents: 3491 diff changeset	1291	static const byte _industry_section_bits[] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1292	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1293	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1294	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1295	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1296	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1297	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1298	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1299	16, 16, 4, 2, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1300	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1301	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1302	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1303	16, 4, 2, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1304	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1305	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1306	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1307	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1308	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1309	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1310	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1311	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1312	16, 16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1313	16, 16, 16, 16, 16, 16, 16,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1314	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1315
2630 7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	1316	static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable* it, int type, const Town* t)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1317	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1318	_error_message = STR_0239_SITE_UNSUITABLE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1319
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1320	do {
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	1321	TileIndex cur_tile = tile + ToTileIndexDiff(it->ti);
37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	1322
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1323	if (!IsValidTile(cur_tile)) {
3440 811c85e5ca0f (svn r4270) Rename some bogus map5 to gfx tron parents: 3422 diff changeset	1324	if (it->gfx == 0xff) continue;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1325	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1326	}
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1327
3440 811c85e5ca0f (svn r4270) Rename some bogus map5 to gfx tron parents: 3422 diff changeset	1328	if (it->gfx == 0xFF) {
3296 34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1329	if (!IsTileType(cur_tile, MP_WATER) \|\|
34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1330	GetTileSlope(cur_tile, NULL) != 0) {
34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1331	return false;
34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1332	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1333	} else {
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1334	if (!EnsureNoVehicle(cur_tile)) return false;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1335
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1336	if (type == IT_OIL_RIG) {
3296 34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1337	if (!IsTileType(cur_tile, MP_WATER) \|\| _m[cur_tile].m5 != 0) return false;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1338	} else {
3296 34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1339	uint tileh;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1340
3296 34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1341	if (IsTileType(cur_tile, MP_WATER) && _m[cur_tile].m5 == 0) return false;
34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1342
34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1343	tileh = GetTileSlope(cur_tile, NULL);
34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1344	if (IsSteepTileh(tileh)) return false;
34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1345
34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1346	if (tileh != 0) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1347	int t;
3494 ba64f1689870 (svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections celestar parents: 3491 diff changeset	1348	byte bits = _industry_section_bits[it->gfx];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1349
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1350	if (bits & 0x10) return false;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1351
3296 34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1352	t = ~tileh;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1353
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1354	if (bits & 1 && (t & (1 + 8))) return false;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1355	if (bits & 2 && (t & (4 + 8))) return false;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1356	if (bits & 4 && (t & (1 + 2))) return false;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1357	if (bits & 8 && (t & (2 + 4))) return false;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1358	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1359
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	1360	if (type == IT_BANK_TEMP) {
3296 34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1361	if (!IsTileType(cur_tile, MP_HOUSE) \|\| t->population < 1200) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1362	_error_message = STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1363	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1364	}
3499 92f95849788c (svn r4350) CodeChange : Add and use accessors [G\|S]etIndustrype. Define and use IndustryGfx type instead of uint belugas parents: 3496 diff changeset	1365	} else if (type == IT_BANK_TROPIC_ARCTIC) {
3296 34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1366	if (!IsTileType(cur_tile, MP_HOUSE)) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1367	_error_message = STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1368	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1369	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1370	} else if (type == IT_TOY_SHOP) {
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1371	if (DistanceMax(t->xy, cur_tile) > 9) return false;
3296 34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1372	if (!IsTileType(cur_tile, MP_HOUSE)) goto do_clear;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1373	} else if (type == IT_WATER_TOWER) {
3296 34064bbe27a5 (svn r4027) Remove another call to FindLandscapeHeightByTile() tron parents: 3291 diff changeset	1374	if (!IsTileType(cur_tile, MP_HOUSE)) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1375	_error_message = STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1376	return false;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1377	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1378	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1379	do_clear:
3491 35d747bb5e82 (svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex tron parents: 3447 diff changeset	1380	if (CmdFailed(DoCommand(cur_tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR)))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1381	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1382	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1383	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1384	}
909 65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1385	} while ((++it)->ti.x != -0x80);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1386
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1387	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1388	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1389
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	1390	static bool CheckIfTooCloseToIndustry(TileIndex tile, int type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1391	{
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1392	const IndustrySpec* spec = &_industry_spec[type];
2548 49c8a096033f (svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes tron parents: 2537 diff changeset	1393	const Industry* i;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1394
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1395	// accepting industries won't be close, not even with patch
2469 59a0073914d8 (svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate tron parents: 2436 diff changeset	1396	if (_patches.same_industry_close && spec->accepts_cargo[0] == CT_INVALID)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1397	return true;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1398
830 36c1366367e4 (svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too truelight parents: 817 diff changeset	1399	FOR_ALL_INDUSTRIES(i) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1400	// check if an industry that accepts the same goods is nearby
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1401	if (i->xy != 0 &&
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1402	DistanceMax(tile, i->xy) <= 14 &&
2469 59a0073914d8 (svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate tron parents: 2436 diff changeset	1403	spec->accepts_cargo[0] != CT_INVALID &&
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1404	spec->accepts_cargo[0] == i->accepts_cargo[0] && (
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1405	_game_mode != GM_EDITOR \|\|
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1406	!_patches.same_industry_close \|\|
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1407	!_patches.multiple_industry_per_town
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1408	)) {
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1409	_error_message = STR_INDUSTRY_TOO_CLOSE;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1410	return false;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1411	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1412
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1413	// check "not close to" field.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1414	if (i->xy != 0 &&
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1415	(i->type == spec->a \|\| i->type == spec->b \|\| i->type == spec->c) &&
1245 3822f77cbc53 (svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names tron parents: 1214 diff changeset	1416	DistanceMax(tile, i->xy) <= 14) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1417	_error_message = STR_INDUSTRY_TOO_CLOSE;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1418	return false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1419	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1420	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1421	return true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1422	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1423
1093 4fdc46eaf423 (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1059 diff changeset	1424	static Industry *AllocateIndustry(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1425	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1426	Industry *i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1427
830 36c1366367e4 (svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too truelight parents: 817 diff changeset	1428	FOR_ALL_INDUSTRIES(i) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1429	if (i->xy == 0) {
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1430	uint index = i->index;
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1431
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1432	if (i->index > _total_industries) _total_industries = i->index;
919 544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	1433
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1434	memset(i, 0, sizeof(*i));
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1435	i->index = index;
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1436
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1437	return i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1438	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1439	}
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1440
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1441	/* Check if we can add a block to the pool */
2549 5587f9a38563 (svn r3078) Some more stuff, which piled up: tron parents: 2548 diff changeset	1442	return AddBlockToPool(&_industry_pool) ? AllocateIndustry() : NULL;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1443	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1444
2630 7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	1445	static void DoCreateNewIndustry(Industry* i, TileIndex tile, int type, const IndustryTileTable* it, const Town* t, byte owner)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1446	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1447	const IndustrySpec *spec;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1448	uint32 r;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1449	int j;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1450
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1451	i->xy = tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1452	i->width = i->height = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1453	i->type = type;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1454
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1455	spec = &_industry_spec[type];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1456
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1457	i->produced_cargo[0] = spec->produced_cargo[0];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1458	i->produced_cargo[1] = spec->produced_cargo[1];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1459	i->accepts_cargo[0] = spec->accepts_cargo[0];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1460	i->accepts_cargo[1] = spec->accepts_cargo[1];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1461	i->accepts_cargo[2] = spec->accepts_cargo[2];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1462	i->production_rate[0] = spec->production_rate[0];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1463	i->production_rate[1] = spec->production_rate[1];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1464
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1465	if (_patches.smooth_economy) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1466	i->production_rate[0] = min((RandomRange(256) + 128) * i->production_rate[0] >> 8 , 255);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1467	i->production_rate[1] = min((RandomRange(256) + 128) * i->production_rate[1] >> 8 , 255);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1468	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1469
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1470	i->town = t;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1471	i->owner = owner;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1472
2484 0e45d70ae908 (svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them tron parents: 2469 diff changeset	1473	r = Random();
2492 b4785c8f3700 (svn r3018) -Fix: Fixed industry colour issue introduced in r3010. peter1138 parents: 2484 diff changeset	1474	i->color_map = GB(r, 8, 4);
b4785c8f3700 (svn r3018) -Fix: Fixed industry colour issue introduced in r3010. peter1138 parents: 2484 diff changeset	1475	i->counter = GB(r, 0, 12);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1476	i->cargo_waiting[0] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1477	i->cargo_waiting[1] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1478	i->last_mo_production[0] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1479	i->last_mo_production[1] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1480	i->last_mo_transported[0] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1481	i->last_mo_transported[1] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1482	i->pct_transported[0] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1483	i->pct_transported[1] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1484	i->total_transported[0] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1485	i->total_transported[1] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1486	i->was_cargo_delivered = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1487	i->last_prod_year = _cur_year;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1488	i->total_production[0] = i->production_rate[0] * 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1489	i->total_production[1] = i->production_rate[1] * 8;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1490
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1491	if (!_generating_world) i->total_production[0] = i->total_production[1] = 0;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1492
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1493	i->prod_level = 0x10;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1494
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1495	do {
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	1496	TileIndex cur_tile = tile + ToTileIndexDiff(it->ti);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1497
3440 811c85e5ca0f (svn r4270) Rename some bogus map5 to gfx tron parents: 3422 diff changeset	1498	if (it->gfx != 0xFF) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1499	byte size;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1500
909 65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1501	size = it->ti.x;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1502	if (size > i->width) i->width = size;
909 65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1503	size = it->ti.y;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1504	if (size > i->height)i->height = size;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1505
3491 35d747bb5e82 (svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex tron parents: 3447 diff changeset	1506	DoCommand(cur_tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1507
3440 811c85e5ca0f (svn r4270) Rename some bogus map5 to gfx tron parents: 3422 diff changeset	1508	MakeIndustry(cur_tile, i->index, it->gfx);
3320 e9e284ab853a (svn r4086) Add MakeIndustry() tron parents: 3314 diff changeset	1509	if (_generating_world) _m[cur_tile].m1 = 0x1E; /* maturity */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1510	}
909 65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff tron parents: 889 diff changeset	1511	} while ((++it)->ti.x != -0x80);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1512
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1513	i->width++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1514	i->height++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1515
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1516	if (i->type == IT_FARM \|\| i->type == IT_FARM_2) {
1981 3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	1517	tile = i->xy + TileDiffXY(i->width / 2, i->height / 2);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1518	for (j = 0; j != 50; j++) {
543 946badd71033 (svn r942) -Merged branch/network back into the trunk truelight parents: 541 diff changeset	1519	int x = Random() % 31 - 16;
946badd71033 (svn r942) -Merged branch/network back into the trunk truelight parents: 541 diff changeset	1520	int y = Random() % 31 - 16;
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1521	TileIndex new_tile = TileAddWrap(tile, x, y);
1977 37bbebf94434 (svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile" tron parents: 1891 diff changeset	1522
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1523	if (new_tile != INVALID_TILE) PlantFarmField(new_tile);
131 16e59d059384 (svn r132) -Fix: [1014278] TileAddWrap() gave wrong results. Fixed now. truelight parents: 110 diff changeset	1524	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1525	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1526	_industry_sort_dirty = true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1527	InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1528	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1529
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1530	/** Build/Fund an industry
3491 35d747bb5e82 (svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex tron parents: 3447 diff changeset	1531	* @param tile tile where industry is built
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1532	* @param p1 industry type @see build_industry.h and @see industry.h
7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1533	* @param p2 unused
7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1534	*/
3491 35d747bb5e82 (svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex tron parents: 3447 diff changeset	1535	int32 CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1536	{
2630 7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	1537	const Town* t;
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1538	Industry *i;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1539	int num;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1540	const IndustryTileTable * const *itt;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1541	const IndustryTileTable *it;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1542	const IndustrySpec *spec;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1543
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1544	SET_EXPENSES_TYPE(EXPENSES_OTHER);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1545
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1546	if (!CheckSuitableIndustryPos(tile)) return CMD_ERROR;
7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1547
7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1548	/* Check if the to-be built/founded industry is available for this climate.
7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1549	* Unfortunately we have no easy way of checking, except for looping the table */
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1550	{
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1551	const byte* i;
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1552	bool found = false;
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1553
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1554	for (i = &_build_industry_types[_opt_ptr->landscape][0]; i != endof(_build_industry_types[_opt_ptr->landscape]); i++) {
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1555	if (*i == p1) {
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1556	found = true;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1557	break;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1558	}
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1559	}
7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1560	if (!found) return CMD_ERROR;
7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1561	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1562
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1563	spec = &_industry_spec[p1];
2638 0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1564	/* If the patch for raw-material industries is not on, you cannot build raw-material industries.
1800 1324958d7c73 (svn r2304) - Fix (regression): excuse the Lumber mill from the list of raw-industries build-restriction, as it can be built always, patch-setting, or no patch-setting. Darkvater parents: 1786 diff changeset	1565	* Raw material industries are industries that do not accept cargo (at least for now)
2638 0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1566	* Exclude the lumber mill (only "raw" industry that can be built) */
0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1567	if (!_patches.build_rawmaterial_ind &&
0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1568	spec->accepts_cargo[0] == CT_INVALID &&
0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1569	spec->accepts_cargo[1] == CT_INVALID &&
0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1570	spec->accepts_cargo[2] == CT_INVALID &&
0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1571	p1 != IT_LUMBER_MILL) {
0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1572	return CMD_ERROR;
0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1573	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1574
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1575	if (!_check_new_industry_procs[spec->check_proc](tile, p1)) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1576
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1577	t = CheckMultipleIndustryInTown(tile, p1);
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1578	if (t == NULL) return CMD_ERROR;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1579
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1580	num = spec->num_table;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1581	itt = spec->table;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1582
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1583	do {
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1584	if (--num < 0) return_cmd_error(STR_0239_SITE_UNSUITABLE);
7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1585	} while (!CheckIfIndustryTilesAreFree(tile, it = itt[num], p1, t));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1586
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1587
1786 7cfd46c3fcc4 (svn r2290) - CodeChange: protect the next batch of commands. This brings us to a total of 61, which is 53% :) Darkvater parents: 1603 diff changeset	1588	if (!CheckIfTooCloseToIndustry(tile, p1)) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1589
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1590	i = AllocateIndustry();
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1591	if (i == NULL) return CMD_ERROR;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1592
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1593	if (flags & DC_EXEC) DoCreateNewIndustry(i, tile, p1, it, t, OWNER_NONE);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1594
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1595	return (_price.build_industry >> 5) * _industry_type_costs[p1];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1596	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1597
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1598
3538 750c4ea83357 (svn r4399) CodeChange : Add and make use of [G\|S]etIndustryAnimationLoop accessors. belugas parents: 3499 diff changeset	1599	Industry *CreateNewIndustry(TileIndex tile, IndustryType type)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1600	{
2630 7206058a7e82 (svn r3172) static, const tron parents: 2598 diff changeset	1601	const Town* t;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1602	const IndustryTileTable *it;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1603	Industry *i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1604
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1605	const IndustrySpec *spec;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1606
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1607	if (!CheckSuitableIndustryPos(tile)) return NULL;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1608
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1609	spec = &_industry_spec[type];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1610
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1611	if (!_check_new_industry_procs[spec->check_proc](tile, type)) return NULL;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1612
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1613	t = CheckMultipleIndustryInTown(tile, type);
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1614	if (t == NULL) return NULL;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1615
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1616	/* pick a random layout */
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1617	it = spec->table[RandomRange(spec->num_table)];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1618
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1619	if (!CheckIfIndustryTilesAreFree(tile, it, type, t)) return NULL;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1620	if (!CheckIfTooCloseToIndustry(tile, type)) return NULL;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1621
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1622	i = AllocateIndustry();
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1623	if (i == NULL) return NULL;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1624
2638 0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1625	DoCreateNewIndustry(i, tile, type, it, t, OWNER_NONE);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1626
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1627	return i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1628	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1629
110 a22a6b07904b (svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n) truelight parents: 61 diff changeset	1630	static const byte _numof_industry_table[4][12] = {
61 cd2827156f2a (svn r62) - Added "None" as option for number of industries in difficulty settings orudge parents: 43 diff changeset	1631	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1632	{0, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1633	{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1634	{0, 2, 3, 4, 6, 7, 8, 9, 10, 10, 10},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1635	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1636
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1637	static void PlaceInitialIndustry(byte type, int amount)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1638	{
2072 66d208875eda (svn r2582) Fix: Prevent generating unrealistically many Oil refineries on large maps. They are always placed next to the borderline, so the perimeter is used instead of area to scale the number of those industries. ludde parents: 2070 diff changeset	1639	int num = _numof_industry_table[_opt.diff.number_industries][amount];
66d208875eda (svn r2582) Fix: Prevent generating unrealistically many Oil refineries on large maps. They are always placed next to the borderline, so the perimeter is used instead of area to scale the number of those industries. ludde parents: 2070 diff changeset	1640
66d208875eda (svn r2582) Fix: Prevent generating unrealistically many Oil refineries on large maps. They are always placed next to the borderline, so the perimeter is used instead of area to scale the number of those industries. ludde parents: 2070 diff changeset	1641	if (type == IT_OIL_REFINERY \|\| type == IT_OIL_RIG) {
66d208875eda (svn r2582) Fix: Prevent generating unrealistically many Oil refineries on large maps. They are always placed next to the borderline, so the perimeter is used instead of area to scale the number of those industries. ludde parents: 2070 diff changeset	1642	// These are always placed next to the coastline, so we scale by the perimeter instead.
66d208875eda (svn r2582) Fix: Prevent generating unrealistically many Oil refineries on large maps. They are always placed next to the borderline, so the perimeter is used instead of area to scale the number of those industries. ludde parents: 2070 diff changeset	1643	num = ScaleByMapSize1D(num);
66d208875eda (svn r2582) Fix: Prevent generating unrealistically many Oil refineries on large maps. They are always placed next to the borderline, so the perimeter is used instead of area to scale the number of those industries. ludde parents: 2070 diff changeset	1644	} else {
66d208875eda (svn r2582) Fix: Prevent generating unrealistically many Oil refineries on large maps. They are always placed next to the borderline, so the perimeter is used instead of area to scale the number of those industries. ludde parents: 2070 diff changeset	1645	num = ScaleByMapSize(num);
66d208875eda (svn r2582) Fix: Prevent generating unrealistically many Oil refineries on large maps. They are always placed next to the borderline, so the perimeter is used instead of area to scale the number of those industries. ludde parents: 2070 diff changeset	1646	}
110 a22a6b07904b (svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n) truelight parents: 61 diff changeset	1647
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1648	if (_opt.diff.number_industries != 0) {
2498 3ed05caa4449 (svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants tron parents: 2493 diff changeset	1649	PlayerID old_player = _current_player;
266 b914f2b7da78 (svn r272) -Fix: industries are once again generated on a new map darkvater parents: 201 diff changeset	1650	_current_player = OWNER_NONE;
61 cd2827156f2a (svn r62) - Added "None" as option for number of industries in difficulty settings orudge parents: 43 diff changeset	1651	assert(num > 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1652
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1653	do {
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1654	uint i;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1655
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1656	for (i = 0; i < 2000; i++) {
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1657	if (CreateNewIndustry(RandomTile(), type) != NULL) break;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1658	}
110 a22a6b07904b (svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n) truelight parents: 61 diff changeset	1659	} while (--num);
266 b914f2b7da78 (svn r272) -Fix: industries are once again generated on a new map darkvater parents: 201 diff changeset	1660
267 ee1ce0133772 (svn r273) -Fix: sorry, wrongly fixed darkvater parents: 266 diff changeset	1661	_current_player = old_player;
61 cd2827156f2a (svn r62) - Added "None" as option for number of industries in difficulty settings orudge parents: 43 diff changeset	1662	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1663	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1664
1093 4fdc46eaf423 (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1059 diff changeset	1665	void GenerateIndustries(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1666	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1667	const byte *b;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1668
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1669	b = _industry_create_table[_opt.landscape];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1670	do {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1671	PlaceInitialIndustry(b[1], b[0]);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1672	} while ( (b+=2)[0] != 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1673	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1674
3496 0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	1675	/* Change industry production or do closure */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1676	static void ExtChangeIndustryProduction(Industry *i)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1677	{
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1678	bool closeit = true;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1679	int j;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1680
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1681	switch (_industry_close_mode[i->type]) {
3496 0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	1682	case INDUSTRYLIFE_NOT_CLOSABLE:
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1683	return;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1684
3496 0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	1685	case INDUSTRYLIFE_CLOSABLE:
1603 8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1686	if ((byte)(_cur_year - i->last_prod_year) < 5 \|\| !CHANCE16(1, 180))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1687	closeit = false;
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1688	break;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1689
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1690	default: /* INDUSTRY_PRODUCTION */
2638 0811adaec525 (svn r3180) Replace some magic numbers by symbolic names tron parents: 2637 diff changeset	1691	for (j = 0; j < 2 && i->produced_cargo[j] != CT_INVALID; j++){
1603 8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1692	uint32 r = Random();
8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1693	int old, new, percent;
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1694	int mag;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1695
1603 8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1696	new = old = i->production_rate[j];
8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1697	if (CHANCE16I(20, 1024, r))
8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1698	new -= ((RandomRange(50) + 10) * old) >> 8;
8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1699	if (CHANCE16I(20 + (i->pct_transported[j] * 20 >> 8), 1024, r >> 16))
8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1700	new += ((RandomRange(50) + 10) * old) >> 8;
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1701
1603 8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1702	new = clamp(new, 0, 255);
8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1703	if (new == old) {
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1704	closeit = false;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1705	continue;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1706	}
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1707
1603 8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1708	percent = new * 100 / old - 100;
8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1709	i->production_rate[j] = new;
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1710
1603 8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1711	if (new >= _industry_spec[i->type].production_rate[j] / 4)
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1712	closeit = false;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1713
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1714	mag = abs(percent);
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1715	if (mag >= 10) {
2070 47b1f29d4671 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2061 diff changeset	1716	SetDParam(2, mag);
1603 8d6b33f98493 (svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange. pasky parents: 1586 diff changeset	1717	SetDParam(0, _cargoc.names_s[i->produced_cargo[j]]);
2070 47b1f29d4671 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2061 diff changeset	1718	SetDParam(1, i->index);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1719	AddNewsItem(
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1720	percent >= 0 ? STR_INDUSTRY_PROD_GOUP : STR_INDUSTRY_PROD_GODOWN,
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1721	NEWS_FLAGS(NM_THIN, NF_VIEWPORT\|NF_TILE, NT_ECONOMY, 0),
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1722	i->xy + TileDiffXY(1, 1), 0
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1723	);
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1724	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1725	}
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1726	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1727	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1728
3496 0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	1729	/* If industry will be closed down, show this */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1730	if (closeit) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1731	i->prod_level = 0;
2070 47b1f29d4671 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2061 diff changeset	1732	SetDParam(0, i->index);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1733	AddNewsItem(
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1734	_industry_close_strings[i->type],
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1735	NEWS_FLAGS(NM_THIN, NF_VIEWPORT\|NF_TILE, NT_ECONOMY, 0),
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1736	i->xy + TileDiffXY(1, 1), 0
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1737	);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1738	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1739	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1740
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1741
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1742	static void UpdateIndustryStatistics(Industry *i)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1743	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1744	byte pct;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1745
2469 59a0073914d8 (svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate tron parents: 2436 diff changeset	1746	if (i->produced_cargo[0] != CT_INVALID) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1747	pct = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1748	if (i->last_mo_production[0] != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1749	i->last_prod_year = _cur_year;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1750	pct = min(i->last_mo_transported[0] * 256 / i->last_mo_production[0],255);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1751	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1752	i->pct_transported[0] = pct;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1753
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1754	i->total_production[0] = i->last_mo_production[0];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1755	i->last_mo_production[0] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1756
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1757	i->total_transported[0] = i->last_mo_transported[0];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1758	i->last_mo_transported[0] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1759	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1760
2469 59a0073914d8 (svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate tron parents: 2436 diff changeset	1761	if (i->produced_cargo[1] != CT_INVALID) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1762	pct = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1763	if (i->last_mo_production[1] != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1764	i->last_prod_year = _cur_year;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1765	pct = min(i->last_mo_transported[1] * 256 / i->last_mo_production[1],255);
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1766	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1767	i->pct_transported[1] = pct;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1768
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1769	i->total_production[1] = i->last_mo_production[1];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1770	i->last_mo_production[1] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1771
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1772	i->total_transported[1] = i->last_mo_transported[1];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1773	i->last_mo_transported[1] = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1774	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1775
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1776
2469 59a0073914d8 (svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate tron parents: 2436 diff changeset	1777	if (i->produced_cargo[0] != CT_INVALID \|\| i->produced_cargo[1] != CT_INVALID)
919 544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	1778	InvalidateWindow(WC_INDUSTRY_VIEW, i->index);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1779
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1780	if (i->prod_level == 0) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1781	DeleteIndustry(i);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1782	} else if (_patches.smooth_economy) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1783	ExtChangeIndustryProduction(i);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1784	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1785	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1786
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1787	static const byte _new_industry_rand[4][32] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1788	{12,12,12,12,12,12,12, 0, 0, 6, 6, 9, 9, 3, 3, 3,18,18, 4, 4, 2, 2, 5, 5, 5, 5, 5, 5, 1, 1, 8, 8},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1789	{16,16,16, 0, 0, 0, 9, 9, 9, 9,13,13, 3, 3, 3, 3,15,15,15, 4, 4,11,11,11,11,11,14,14, 1, 1, 7, 7},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1790	{21,21,21,24,22,22,22,22,23,23,12,12,12, 4, 4,19,19,19,13,13,20,20,20,11,11,11,17,17,17,10,10,10},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1791	{30,30,30,36,36,31,31,31,27,27,27,28,28,28,26,26,26,34,34,34,35,35,35,29,29,29,32,32,32,33,33,33},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1792	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1793
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1794	static void MaybeNewIndustry(uint32 r)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1795	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1796	int type;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1797	int j;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1798	Industry *i;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1799
2140 a04d0142ad65 (svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read tron parents: 2133 diff changeset	1800	type = _new_industry_rand[_opt.landscape][GB(r, 16, 5)];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1801
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1802	if (type == IT_OIL_WELL && _date > 10958) return;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1803	if (type == IT_OIL_RIG && _date < 14610) return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1804
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1805	j = 2000;
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1806	for (;;) {
2637 722dae65c4a8 (svn r3179) - RandomRange() and RandomTile() instead of home brewed versions tron parents: 2630 diff changeset	1807	i = CreateNewIndustry(RandomTile(), type);
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1808	if (i != NULL) break;
eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1809	if (--j == 0) return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1810	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1811
534 306bc86eb23e (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	1812	SetDParam(0, type + STR_4802_COAL_MINE);
306bc86eb23e (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	1813	SetDParam(1, i->town->index);
2260 10154bc4c650 (svn r2780) Remove some more unused strings and make the use of a few strings more explicit tron parents: 2187 diff changeset	1814	AddNewsItem(
10154bc4c650 (svn r2780) Remove some more unused strings and make the use of a few strings more explicit tron parents: 2187 diff changeset	1815	(type != IT_FOREST) ?
10154bc4c650 (svn r2780) Remove some more unused strings and make the use of a few strings more explicit tron parents: 2187 diff changeset	1816	STR_482D_NEW_UNDER_CONSTRUCTION : STR_482E_NEW_BEING_PLANTED_NEAR,
10154bc4c650 (svn r2780) Remove some more unused strings and make the use of a few strings more explicit tron parents: 2187 diff changeset	1817	NEWS_FLAGS(NM_THIN, NF_VIEWPORT\|NF_TILE, NT_ECONOMY,0), i->xy, 0
10154bc4c650 (svn r2780) Remove some more unused strings and make the use of a few strings more explicit tron parents: 2187 diff changeset	1818	);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1819	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1820
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1821	static void ChangeIndustryProduction(Industry *i)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1822	{
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1823	bool only_decrease = false;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1824	StringID str = STR_NULL;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1825	int type = i->type;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1826
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1827	switch (_industry_close_mode[type]) {
3496 0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	1828	case INDUSTRYLIFE_NOT_CLOSABLE:
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1829	return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1830
3496 0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	1831	case INDUSTRYLIFE_PRODUCTION:
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1832	/* decrease or increase */
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1833	if (type == IT_OIL_WELL && _opt.landscape == LT_NORMAL)
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1834	only_decrease = true;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1835
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1836	if (only_decrease \|\| CHANCE16(1,3)) {
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1837	/* If you transport > 60%, 66% chance we increase, else 33% chance we increase */
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1838	if (!only_decrease && (i->pct_transported[0] > 153) != CHANCE16(1,3)) {
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1839	/* Increase production */
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1840	if (i->prod_level != 0x80) {
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1841	byte b;
201 c40d343115f8 (svn r202) -Codechange: I missed some files with trailing spaces.. this should be truelight parents: 159 diff changeset	1842
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1843	i->prod_level <<= 1;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1844
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1845	b = i->production_rate[0] * 2;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1846	if (i->production_rate[0] >= 128)
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1847	b = 0xFF;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1848	i->production_rate[0] = b;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1849
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1850	b = i->production_rate[1] * 2;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1851	if (i->production_rate[1] >= 128)
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1852	b = 0xFF;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1853	i->production_rate[1] = b;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1854
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1855	str = _industry_prod_up_strings[type];
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1856	}
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1857	} else {
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1858	/* Decrease production */
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1859	if (i->prod_level == 4) {
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1860	i->prod_level = 0;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1861	str = _industry_close_strings[type];
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1862	} else {
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1863	i->prod_level >>= 1;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1864	i->production_rate[0] = (i->production_rate[0] + 1) >> 1;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1865	i->production_rate[1] = (i->production_rate[1] + 1) >> 1;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1866
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1867	str = _industry_prod_down_strings[type];
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1868	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1869	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1870	}
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1871	break;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1872
3496 0959ead7c2af (svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G\|S]etIndustrype belugas parents: 3495 diff changeset	1873	case INDUSTRYLIFE_CLOSABLE:
1320 44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1874	/* maybe close */
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1875	if ( (byte)(_cur_year - i->last_prod_year) >= 5 && CHANCE16(1,2)) {
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1876	i->prod_level = 0;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1877	str = _industry_close_strings[type];
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1878	}
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1879	break;
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1880	}
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1881
44a8658d88c0 (svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable truelight parents: 1287 diff changeset	1882	if (str != STR_NULL) {
2070 47b1f29d4671 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2061 diff changeset	1883	SetDParam(0, i->index);
1981 3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1980 diff changeset	1884	AddNewsItem(str, NEWS_FLAGS(NM_THIN, NF_VIEWPORT\|NF_TILE, NT_ECONOMY, 0), i->xy + TileDiffXY(1, 1), 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1885	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1886	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1887
1093 4fdc46eaf423 (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1059 diff changeset	1888	void IndustryMonthlyLoop(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1889	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1890	Industry *i;
2498 3ed05caa4449 (svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants tron parents: 2493 diff changeset	1891	PlayerID old_player = _current_player;
266 b914f2b7da78 (svn r272) -Fix: industries are once again generated on a new map darkvater parents: 201 diff changeset	1892	_current_player = OWNER_NONE;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1893
830 36c1366367e4 (svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too truelight parents: 817 diff changeset	1894	FOR_ALL_INDUSTRIES(i) {
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1895	if (i->xy != 0) UpdateIndustryStatistics(i);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1896	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1897
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1898	/* 3% chance that we start a new industry */
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1899	if (CHANCE16(3, 100)) {
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1900	MaybeNewIndustry(Random());
1269 0c8818a1c07a (svn r1773) -Fix: [ 1114950 ] Game crashed sometimes when there were no industries truelight parents: 1267 diff changeset	1901	} else if (!_patches.smooth_economy && _total_industries > 0) {
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1902	i = GetIndustry(RandomRange(_total_industries));
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1903	if (i->xy != 0) ChangeIndustryProduction(i);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1904	}
266 b914f2b7da78 (svn r272) -Fix: industries are once again generated on a new map darkvater parents: 201 diff changeset	1905
b914f2b7da78 (svn r272) -Fix: industries are once again generated on a new map darkvater parents: 201 diff changeset	1906	_current_player = old_player;
b914f2b7da78 (svn r272) -Fix: industries are once again generated on a new map darkvater parents: 201 diff changeset	1907
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1908	// production-change
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1909	_industry_sort_dirty = true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1910	InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1911	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1912
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1913
1093 4fdc46eaf423 (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1059 diff changeset	1914	void InitializeIndustries(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1915	{
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1916	CleanPool(&_industry_pool);
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1917	AddBlockToPool(&_industry_pool);
919 544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	1918
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1919	_total_industries = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1920	_industry_sort_dirty = true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1921	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1922
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1923	const TileTypeProcs _tile_type_industry_procs = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1924	DrawTile_Industry, /* draw_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1925	GetSlopeZ_Industry, /* get_slope_z_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1926	ClearTile_Industry, /* clear_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1927	GetAcceptedCargo_Industry, /* get_accepted_cargo_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1928	GetTileDesc_Industry, /* get_tile_desc_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1929	GetTileTrackStatus_Industry,/* get_tile_track_status_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1930	ClickTile_Industry, /* click_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1931	AnimateTile_Industry, /* animate_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1932	TileLoop_Industry, /* tile_loop_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1933	ChangeTileOwner_Industry, /* change_tile_owner_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1934	GetProducedCargo_Industry, /* get_produced_cargo_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1935	NULL, /* vehicle_enter_tile_proc */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1936	NULL, /* vehicle_leave_tile_proc */
39 d177340ed556 (svn r40) Final slope graphics fix dominik parents: 7 diff changeset	1937	GetSlopeTileh_Industry, /* get_slope_tileh_proc */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1938	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1939
1881 435d39bd6ee0 (svn r2387) - CodeChange: made the saveload code more readable and also removed the 'byte' saveload arrays which means you can save an array of more than 255 elements, or bigger structs than 255 bytes. This doesn't yet solve the problem that a chunk can be a maximum of 16384 big. Darkvater parents: 1800 diff changeset	1940	static const SaveLoad _industry_desc[] = {
1174 6a5e747f3ba6 (svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change tron parents: 1093 diff changeset	1941	SLE_CONDVAR(Industry, xy, SLE_FILE_U16 \| SLE_VAR_U32, 0, 5),
3047 2880aef0ee9d (svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION Darkvater parents: 2979 diff changeset	1942	SLE_CONDVAR(Industry, xy, SLE_UINT32, 6, SL_MAX_VERSION),
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1943	SLE_VAR(Industry,width, SLE_UINT8),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1944	SLE_VAR(Industry,height, SLE_UINT8),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1945	SLE_REF(Industry,town, REF_TOWN),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1946	SLE_ARR(Industry,produced_cargo, SLE_UINT8, 2),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1947	SLE_ARR(Industry,cargo_waiting, SLE_UINT16, 2),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1948	SLE_ARR(Industry,production_rate, SLE_UINT8, 2),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1949	SLE_ARR(Industry,accepts_cargo, SLE_UINT8, 3),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1950	SLE_VAR(Industry,prod_level, SLE_UINT8),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1951	SLE_ARR(Industry,last_mo_production,SLE_UINT16, 2),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1952	SLE_ARR(Industry,last_mo_transported,SLE_UINT16, 2),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1953	SLE_ARR(Industry,pct_transported,SLE_UINT8, 2),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1954	SLE_ARR(Industry,total_production,SLE_UINT16, 2),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1955	SLE_ARR(Industry,total_transported,SLE_UINT16, 2),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1956
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1957	SLE_VAR(Industry,counter, SLE_UINT16),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1958
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1959	SLE_VAR(Industry,type, SLE_UINT8),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1960	SLE_VAR(Industry,owner, SLE_UINT8),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1961	SLE_VAR(Industry,color_map, SLE_UINT8),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1962	SLE_VAR(Industry,last_prod_year, SLE_UINT8),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1963	SLE_VAR(Industry,was_cargo_delivered,SLE_UINT8),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1964
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1965	// reserve extra space in savegame here. (currently 32 bytes)
3222 6de22e06a1e9 (svn r3895) - Add proper SLE(G)_CONDNULL macros for the empty space reservation in savegames and update where used Darkvater parents: 3173 diff changeset	1966	SLE_CONDNULL(32, 2, SL_MAX_VERSION),
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1967
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1968	SLE_END()
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1969	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1970
1093 4fdc46eaf423 (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1059 diff changeset	1971	static void Save_INDY(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1972	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1973	Industry *ind;
919 544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	1974
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1975	// Write the vehicles
830 36c1366367e4 (svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too truelight parents: 817 diff changeset	1976	FOR_ALL_INDUSTRIES(ind) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1977	if (ind->xy != 0) {
919 544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	1978	SlSetArrayIndex(ind->index);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1979	SlObject(ind, _industry_desc);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1980	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1981	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1982	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1983
1093 4fdc46eaf423 (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1059 diff changeset	1984	static void Load_INDY(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1985	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1986	int index;
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1987
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1988	_total_industries = 0;
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1989
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1990	while ((index = SlIterateArray()) != -1) {
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1991	Industry *i;
919 544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	1992
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1993	if (!AddBlockIfNeeded(&_industry_pool, index))
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1994	error("Industries: failed loading savegame: too many industries");
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1995
ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1996	i = GetIndustry(index);
919 544f374ee392 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 909 diff changeset	1997	SlObject(i, _industry_desc);
1267 ba42a505ab8a (svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating truelight parents: 1247 diff changeset	1998
2639 eeaefdabfdfd (svn r3181) -Bracing tron parents: 2638 diff changeset	1999	if (index > _total_industries) _total_industries = index;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2000	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2001	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2002
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2003	const ChunkHandler _industry_chunk_handlers[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2004	{ 'INDY', Save_INDY, Load_INDY, CH_ARRAY \| CH_LAST},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	2005	};

author	belugas
	Fri, 14 Apr 2006 01:54:07 +0000
changeset 3545	b08ce1bbb589
parent 3538	750c4ea83357
child 3553	4aab99ade276
permissions	-rw-r--r--