author | rubidium |
Mon, 19 Mar 2007 19:22:26 +0000 | |
branch | 0.5 |
changeset 5461 | 03285c9589f9 |
parent 5319 | 65acb2e92975 |
child 5518 | d5923d3fa08c |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
0 | 3 |
#include "stdafx.h" |
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1881
diff
changeset
|
4 |
#include "openttd.h" |
3144
426b825578f9
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
3094
diff
changeset
|
5 |
#include "clear_map.h" |
4356
bc52a48e2590
(svn r6057) -Codechange: made a function GetRandomXXX, that _always_ returns a valid XXX, unless there are none to pick from. Then NULL is returned.
truelight
parents:
4354
diff
changeset
|
6 |
#include "functions.h" |
3314
b8b234d4584f
(svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile
tron
parents:
3296
diff
changeset
|
7 |
#include "industry_map.h" |
3338
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3331
diff
changeset
|
8 |
#include "station_map.h" |
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
497
diff
changeset
|
9 |
#include "table/strings.h" |
2148
47ba4a1b1c3b
(svn r2658) -Codechange: Use MAKE_TRANSPARENT to display a transparented sprite
celestar
parents:
2140
diff
changeset
|
10 |
#include "table/sprites.h" |
679
e959706a3e4d
(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
a1ac96655b79
(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 | 13 |
#include "viewport.h" |
14 |
#include "command.h" |
|
15 |
#include "industry.h" |
|
16 |
#include "town.h" |
|
17 |
#include "vehicle.h" |
|
18 |
#include "news.h" |
|
19 |
#include "saveload.h" |
|
20 |
#include "economy.h" |
|
337
66647f97e7c0
(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
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2150
diff
changeset
|
22 |
#include "variables.h" |
3654
4a3f8056a61c
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
belugas
parents:
3645
diff
changeset
|
23 |
#include "table/industry_land.h" |
4a3f8056a61c
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
belugas
parents:
3645
diff
changeset
|
24 |
#include "table/build_industry.h" |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
25 |
#include "genworld.h" |
4261
2ec8f5a9747b
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
4231
diff
changeset
|
26 |
#include "date.h" |
5056
20369e09627b
(svn r7109) -Codechange: use map accessor IsClearWaterTile
belugas
parents:
4976
diff
changeset
|
27 |
#include "water_map.h" |
0 | 28 |
|
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
29 |
void ShowIndustryViewWindow(int industry); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
30 |
void BuildOilRig(TileIndex tile); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
31 |
void DeleteOilRig(TileIndex tile); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
32 |
|
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
33 |
static byte _industry_sound_ctr; |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
34 |
static TileIndex _industry_sound_tile; |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
35 |
|
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
36 |
/** |
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
37 |
* Called if a new block is added to the industry-pool |
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
38 |
*/ |
2817 | 39 |
static void IndustryPoolNewBlock(uint start_item) |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
40 |
{ |
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
41 |
Industry *i; |
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
42 |
|
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
43 |
/* We don't use FOR_ALL here, because FOR_ALL skips invalid items. |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
44 |
* TODO - This is just a temporary stage, this will be removed. */ |
4976
a0d7f63c35b5
(svn r6979) Use the pool macros for the Industry pool
tron
parents:
4965
diff
changeset
|
45 |
for (i = GetIndustry(start_item); i != NULL; i = (i->index + 1U < GetIndustryPoolSize()) ? GetIndustry(i->index + 1U) : NULL) i->index = start_item++; |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
46 |
} |
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
47 |
|
5216
d581e4db95b6
(svn r7331) - Codechange: Rename all memory pool macro's and types to "old pool", so the new pool implementation can be committed alongside it.
matthijs
parents:
5118
diff
changeset
|
48 |
DEFINE_OLD_POOL(Industry, Industry, IndustryPoolNewBlock, NULL) |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
49 |
|
3499
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
50 |
/** |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
51 |
* Retrieve the type for this industry. Although it is accessed by a tile, |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
52 |
* it will return the general type of industry, and not the sprite index |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
53 |
* as would do GetIndustryGfx. |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
54 |
* The same information can be accessed by looking at Industry->type |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
55 |
* @param tile that is queried |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
56 |
* @pre IsTileType(tile, MP_INDUSTRY) |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
57 |
* @return general type for this industry, as defined in industry.h |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
58 |
**/ |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
59 |
IndustryType GetIndustryType(TileIndex tile) |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
60 |
{ |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
61 |
IndustryGfx this_type = GetIndustryGfx(tile); |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
62 |
IndustryType iloop; |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
63 |
|
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
64 |
assert(IsTileType(tile, MP_INDUSTRY)); |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
65 |
|
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
66 |
for (iloop = IT_COAL_MINE; iloop < IT_END; iloop += 1) { |
3545
3e66bf329257
(svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come
belugas
parents:
3538
diff
changeset
|
67 |
if (IS_BYTE_INSIDE(this_type, industry_gfx_Solver[iloop].MinGfx, |
3553
b34eae3b8d0f
(svn r4425) Fix bug introduced in r4411 : while IS_BYTE_INSIDE, max value is STRICKLY LESS THEN. This caused airports animations to stay unanimated. Industries were similarly affected.
belugas
parents:
3545
diff
changeset
|
68 |
industry_gfx_Solver[iloop].MaxGfx+1)) { |
3499
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
69 |
return iloop; |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
70 |
} |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
71 |
} |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
72 |
|
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
73 |
return IT_INVALID; //we have not found equivalent, whatever the reason |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
74 |
} |
0 | 75 |
|
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
76 |
/** |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
77 |
* Accessor for array _industry_specs. |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
78 |
* This will ensure at once : proper access and |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
79 |
* not allowing modifications of it. |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
80 |
* @param thistype of industry (which is the index in _industry_specs) |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
81 |
* @pre thistype < IT_END |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
82 |
**/ |
3689
db67c356f44b
(svn r4614) CodeChange : Cleanup of industry_cmd (Step-4).
belugas
parents:
3669
diff
changeset
|
83 |
const IndustrySpec *GetIndustrySpec(IndustryType thistype) |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
84 |
{ |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
85 |
assert(thistype < IT_END); |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
86 |
return &_industry_specs[thistype]; |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
87 |
} |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
88 |
|
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
89 |
void DestroyIndustry(Industry *i) |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
90 |
{ |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
91 |
BEGIN_TILE_LOOP(tile_cur, i->width, i->height, i->xy); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
92 |
if (IsTileType(tile_cur, MP_INDUSTRY)) { |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
93 |
if (GetIndustryIndex(tile_cur) == i->index) { |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
94 |
DoClearSquare(tile_cur); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
95 |
} |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
96 |
} else if (IsTileType(tile_cur, MP_STATION) && IsOilRig(tile_cur)) { |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
97 |
DeleteOilRig(tile_cur); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
98 |
} |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
99 |
END_TILE_LOOP(tile_cur, i->width, i->height, i->xy); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
100 |
|
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
101 |
if (i->type == IT_FARM || i->type == IT_FARM_2) { |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
102 |
/* Remove the farmland and convert it to regular tiles over time. */ |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
103 |
BEGIN_TILE_LOOP(tile_cur, 42, 42, i->xy - TileDiffXY(21, 21)) { |
4815
c2a54b213fde
(svn r6739) -Fix (r6001): Crash on removing farmland belonging to a farm. The search would loop
Darkvater
parents:
4607
diff
changeset
|
104 |
tile_cur = TILE_MASK(tile_cur); |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
105 |
if (IsTileType(tile_cur, MP_CLEAR) && IsClearGround(tile_cur, CLEAR_FIELDS) && |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
106 |
GetIndustryIndexOfField(tile_cur) == i->index) { |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
107 |
SetIndustryIndexOfField(tile_cur, INVALID_INDUSTRY); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
108 |
} |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
109 |
} END_TILE_LOOP(tile_cur, 42, 42, i->xy - TileDiff(21, 21)) |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
110 |
} |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
111 |
|
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
112 |
_industry_sort_dirty = true; |
5298
6d4c150bdd94
(svn r7451) -Fix (7372): GetNum(Towns|Industries) should return the actual number of towns and industries.
rubidium
parents:
5247
diff
changeset
|
113 |
_total_industries--; |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
114 |
DeleteSubsidyWithIndustry(i->index); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
115 |
DeleteWindowById(WC_INDUSTRY_VIEW, i->index); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
116 |
InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
117 |
} |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
118 |
|
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
119 |
static void IndustryDrawSugarMine(const TileInfo *ti) |
0 | 120 |
{ |
121 |
const DrawIndustrySpec1Struct *d; |
|
122 |
uint32 image; |
|
123 |
||
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
124 |
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
|
125 |
|
2049
ad0d49c916d4
(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
|
126 |
d = &_draw_industry_spec1[_m[ti->tile].m3]; |
0 | 127 |
|
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
128 |
AddChildSpriteScreen(SPR_IT_SUGAR_MINE_SIEVE + d->image_1, d->x, 0); |
0 | 129 |
|
2639 | 130 |
image = d->image_2; |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
131 |
if (image != 0) AddChildSpriteScreen(SPR_IT_SUGAR_MINE_CLOUDS + image - 1, 8, 41); |
0 | 132 |
|
2639 | 133 |
image = d->image_3; |
134 |
if (image != 0) { |
|
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
135 |
AddChildSpriteScreen(SPR_IT_SUGAR_MINE_PILE + image - 1, |
2639 | 136 |
_drawtile_proc1_x[image - 1], _drawtile_proc1_y[image - 1]); |
137 |
} |
|
0 | 138 |
} |
139 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
140 |
static void IndustryDrawToffeeQuarry(const TileInfo *ti) |
0 | 141 |
{ |
142 |
int x = 0; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
143 |
|
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
144 |
if (IsIndustryCompleted(ti->tile)) { |
2049
ad0d49c916d4
(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
|
145 |
x = _industry_anim_offs[_m[ti->tile].m3]; |
0 | 146 |
if ( (byte)x == 0xFF) |
147 |
x = 0; |
|
148 |
} |
|
149 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
150 |
AddChildSpriteScreen(SPR_IT_TOFFEE_QUARRY_SHOVEL, 22 - x, 24 + x); |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
151 |
AddChildSpriteScreen(SPR_IT_TOFFEE_QUARRY_TOFFEE, 6, 14); |
0 | 152 |
} |
153 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
154 |
static void IndustryDrawBubbleGenerator( const TileInfo *ti) |
0 | 155 |
{ |
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
156 |
if (IsIndustryCompleted(ti->tile)) { |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
157 |
AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_BUBBLE, 5, _industry_anim_offs_2[_m[ti->tile].m3]); |
2639 | 158 |
} else { |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
159 |
AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_SPRING, 3, 67); |
0 | 160 |
} |
161 |
} |
|
162 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
163 |
static void IndustryDrawToyFactory(const TileInfo *ti) |
0 | 164 |
{ |
165 |
const DrawIndustrySpec4Struct *d; |
|
166 |
||
2049
ad0d49c916d4
(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
|
167 |
d = &_industry_anim_offs_3[_m[ti->tile].m3]; |
0 | 168 |
|
169 |
if (d->image_1 != 0xFF) { |
|
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
170 |
AddChildSpriteScreen(SPR_IT_TOY_FACTORY_CLAY, 50 - d->image_1 * 2, 96 + d->image_1); |
0 | 171 |
} |
172 |
||
173 |
if (d->image_2 != 0xFF) { |
|
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
174 |
AddChildSpriteScreen(SPR_IT_TOY_FACTORY_ROBOT, 16 - d->image_2 * 2, 100 + d->image_2); |
0 | 175 |
} |
176 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
177 |
AddChildSpriteScreen(SPR_IT_TOY_FACTORY_STAMP, 7, d->image_3); |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
178 |
AddChildSpriteScreen(SPR_IT_TOY_FACTORY_STAMP_HOLDER, 0, 42); |
0 | 179 |
} |
180 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
181 |
static void IndustryDrawCoalPlantSparks(const TileInfo *ti) |
0 | 182 |
{ |
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
183 |
if (IsIndustryCompleted(ti->tile)) { |
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
184 |
uint image = GB(_m[ti->tile].m1, 2, 5); |
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
185 |
|
0 | 186 |
if (image != 0 && image < 7) { |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
187 |
AddChildSpriteScreen(image + SPR_IT_POWER_PLANT_TRANSFORMERS, |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
188 |
_coal_plant_sparks_x[image - 1], |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
189 |
_coal_plant_sparks_y[image - 1] |
0 | 190 |
); |
191 |
} |
|
192 |
} |
|
193 |
} |
|
194 |
||
2436
177cb6a8339f
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2360
diff
changeset
|
195 |
typedef void IndustryDrawTileProc(const TileInfo *ti); |
0 | 196 |
static IndustryDrawTileProc * const _industry_draw_tile_procs[5] = { |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
197 |
IndustryDrawSugarMine, |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
198 |
IndustryDrawToffeeQuarry, |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
199 |
IndustryDrawBubbleGenerator, |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
200 |
IndustryDrawToyFactory, |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
201 |
IndustryDrawCoalPlantSparks, |
0 | 202 |
}; |
203 |
||
204 |
static void DrawTile_Industry(TileInfo *ti) |
|
205 |
{ |
|
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
206 |
const Industry *ind; |
3654
4a3f8056a61c
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
belugas
parents:
3645
diff
changeset
|
207 |
const DrawBuildingsTileStruct *dits; |
0 | 208 |
byte z; |
209 |
uint32 image, ormod; |
|
210 |
||
211 |
/* Pointer to industry */ |
|
3314
b8b234d4584f
(svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile
tron
parents:
3296
diff
changeset
|
212 |
ind = GetIndustryByTile(ti->tile); |
4942
f990abfa4438
(svn r6930) -Codechange: Move industry name into IndustrySpec
belugas
parents:
4924
diff
changeset
|
213 |
ormod = GENERAL_SPRITE_COLOR(ind->random_color); |
0 | 214 |
|
215 |
/* Retrieve pointer to the draw industry tile struct */ |
|
3495
f7d3ae07f4aa
(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
|
216 |
dits = &_industry_draw_tile_data[GetIndustryGfx(ti->tile) << 2 | GetIndustryConstructionStage(ti->tile)]; |
0 | 217 |
|
3654
4a3f8056a61c
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
belugas
parents:
3645
diff
changeset
|
218 |
image = dits->ground; |
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
219 |
if (image & PALETTE_MODIFIER_COLOR && (image & PALETTE_SPRITE_MASK) == 0) |
0 | 220 |
image |= ormod; |
221 |
||
222 |
z = ti->z; |
|
223 |
/* Add bricks below the industry? */ |
|
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3585
diff
changeset
|
224 |
if (ti->tileh != SLOPE_FLAT) { |
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3585
diff
changeset
|
225 |
AddSortableSpriteToDraw(SPR_FOUNDATION_BASE + ti->tileh, ti->x, ti->y, 16, 16, 7, z); |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
226 |
AddChildSpriteScreen(image, 31, 1); |
3645
86af43f87885
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3636
diff
changeset
|
227 |
z += TILE_HEIGHT; |
0 | 228 |
} else { |
229 |
/* Else draw regular ground */ |
|
230 |
DrawGroundSprite(image); |
|
231 |
} |
|
232 |
||
233 |
/* Add industry on top of the ground? */ |
|
3654
4a3f8056a61c
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
belugas
parents:
3645
diff
changeset
|
234 |
image = dits->building; |
2639 | 235 |
if (image != 0) { |
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
236 |
if (image & PALETTE_MODIFIER_COLOR && (image & PALETTE_SPRITE_MASK) == 0) |
0 | 237 |
image |= ormod; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
238 |
|
2639 | 239 |
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
|
240 |
|
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
241 |
AddSortableSpriteToDraw(image, |
2653
4173d9a0a27e
(svn r3195) Use bitfields instead of explicit shifting/masking
tron
parents:
2639
diff
changeset
|
242 |
ti->x + dits->subtile_x, |
4173d9a0a27e
(svn r3195) Use bitfields instead of explicit shifting/masking
tron
parents:
2639
diff
changeset
|
243 |
ti->y + dits->subtile_y, |
4173d9a0a27e
(svn r3195) Use bitfields instead of explicit shifting/masking
tron
parents:
2639
diff
changeset
|
244 |
dits->width + 1, |
4173d9a0a27e
(svn r3195) Use bitfields instead of explicit shifting/masking
tron
parents:
2639
diff
changeset
|
245 |
dits->height + 1, |
0 | 246 |
dits->dz, |
247 |
z); |
|
248 |
||
2639 | 249 |
if (_display_opt & DO_TRANS_BUILDINGS) return; |
0 | 250 |
} |
251 |
||
2639 | 252 |
{ |
3654
4a3f8056a61c
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
belugas
parents:
3645
diff
changeset
|
253 |
int proc = dits->draw_proc - 1; |
2639 | 254 |
if (proc >= 0) _industry_draw_tile_procs[proc](ti); |
0 | 255 |
} |
256 |
} |
|
257 |
||
4231
dea6a63dd058
(svn r5794) Pass the TileIndex plus x and y coordinates into GetSlopeZ_* instead of a TileInfo
tron
parents:
4077
diff
changeset
|
258 |
static uint GetSlopeZ_Industry(TileIndex tile, uint x, uint y) |
2537 | 259 |
{ |
4231
dea6a63dd058
(svn r5794) Pass the TileIndex plus x and y coordinates into GetSlopeZ_* instead of a TileInfo
tron
parents:
4077
diff
changeset
|
260 |
return GetTileMaxZ(tile); |
0 | 261 |
} |
262 |
||
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3585
diff
changeset
|
263 |
static Slope GetSlopeTileh_Industry(TileIndex tile, Slope tileh) |
2548
97ada3bd2702
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2537
diff
changeset
|
264 |
{ |
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3585
diff
changeset
|
265 |
return SLOPE_FLAT; |
39 | 266 |
} |
267 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
268 |
static void GetAcceptedCargo_Industry(TileIndex tile, AcceptedCargo ac) |
0 | 269 |
{ |
3499
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
270 |
IndustryGfx gfx = GetIndustryGfx(tile); |
2598
574b5774149c
(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
|
271 |
CargoID a; |
0 | 272 |
|
3494
cee53fba309a
(svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections
celestar
parents:
3491
diff
changeset
|
273 |
a = _industry_section_accepts_1[gfx]; |
2598
574b5774149c
(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
|
274 |
if (a != CT_INVALID) ac[a] = (a == 0) ? 1 : 8; |
0 | 275 |
|
3494
cee53fba309a
(svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections
celestar
parents:
3491
diff
changeset
|
276 |
a = _industry_section_accepts_2[gfx]; |
2598
574b5774149c
(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
|
277 |
if (a != CT_INVALID) ac[a] = 8; |
0 | 278 |
|
3494
cee53fba309a
(svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections
celestar
parents:
3491
diff
changeset
|
279 |
a = _industry_section_accepts_3[gfx]; |
2598
574b5774149c
(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
|
280 |
if (a != CT_INVALID) ac[a] = 8; |
0 | 281 |
} |
282 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
283 |
static void GetTileDesc_Industry(TileIndex tile, TileDesc *td) |
0 | 284 |
{ |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
285 |
const Industry *i = GetIndustryByTile(tile); |
0 | 286 |
|
287 |
td->owner = i->owner; |
|
4942
f990abfa4438
(svn r6930) -Codechange: Move industry name into IndustrySpec
belugas
parents:
4924
diff
changeset
|
288 |
td->str = GetIndustrySpec(i->type)->name; |
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
289 |
if (!IsIndustryCompleted(tile)) { |
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
290 |
SetDParamX(td->dparam, 0, td->str); |
0 | 291 |
td->str = STR_2058_UNDER_CONSTRUCTION; |
292 |
} |
|
293 |
} |
|
294 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
295 |
static int32 ClearTile_Industry(TileIndex tile, byte flags) |
0 | 296 |
{ |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
297 |
Industry *i = GetIndustryByTile(tile); |
0 | 298 |
|
4434
4175805666a5
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4403
diff
changeset
|
299 |
/* water can destroy industries |
4175805666a5
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4403
diff
changeset
|
300 |
* in editor you can bulldoze industries |
4175805666a5
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4403
diff
changeset
|
301 |
* with magic_bulldozer cheat you can destroy industries |
4175805666a5
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4403
diff
changeset
|
302 |
* (area around OILRIG is water, so water shouldn't flood it |
4175805666a5
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4403
diff
changeset
|
303 |
*/ |
149
5f7d4b21df01
(svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs
darkvater
parents:
131
diff
changeset
|
304 |
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
|
305 |
!_cheats.magic_bulldozer.value) || |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3877
diff
changeset
|
306 |
(_current_player == OWNER_WATER && i->type == IT_OIL_RIG)) { |
4942
f990abfa4438
(svn r6930) -Codechange: Move industry name into IndustrySpec
belugas
parents:
4924
diff
changeset
|
307 |
SetDParam(0, GetIndustrySpec(i->type)->name); |
0 | 308 |
return_cmd_error(STR_4800_IN_THE_WAY); |
309 |
} |
|
310 |
||
2639 | 311 |
if (flags & DC_EXEC) DeleteIndustry(i); |
0 | 312 |
return 0; |
313 |
} |
|
314 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
315 |
static void TransportIndustryGoods(TileIndex tile) |
0 | 316 |
{ |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
317 |
Industry *i = GetIndustryByTile(tile); |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
318 |
const IndustrySpec *indspec = GetIndustrySpec(i->type); |
0 | 319 |
uint cw, am; |
320 |
||
2639 | 321 |
cw = min(i->cargo_waiting[0], 255); |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
322 |
if (cw > indspec->minimal_cargo/* && i->produced_cargo[0] != 0xFF*/) { |
0 | 323 |
i->cargo_waiting[0] -= cw; |
324 |
||
325 |
/* fluctuating economy? */ |
|
2639 | 326 |
if (_economy.fluct <= 0) cw = (cw + 1) / 2; |
0 | 327 |
|
328 |
i->last_mo_production[0] += cw; |
|
329 |
||
330 |
am = MoveGoodsToStation(i->xy, i->width, i->height, i->produced_cargo[0], cw); |
|
331 |
i->last_mo_transported[0] += am; |
|
3331 | 332 |
if (am != 0) { |
3494
cee53fba309a
(svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections
celestar
parents:
3491
diff
changeset
|
333 |
uint newgfx = _industry_produce_section[GetIndustryGfx(tile)]; |
3331 | 334 |
|
335 |
if (newgfx != 0xFF) { |
|
3495
f7d3ae07f4aa
(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
|
336 |
ResetIndustryConstructionStage(tile); |
f7d3ae07f4aa
(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
|
337 |
SetIndustryCompleted(tile, true); |
3331 | 338 |
SetIndustryGfx(tile, newgfx); |
339 |
MarkTileDirtyByTile(tile); |
|
340 |
} |
|
0 | 341 |
} |
342 |
} |
|
343 |
||
344 |
cw = min(i->cargo_waiting[1], 255); |
|
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
345 |
if (cw > indspec->minimal_cargo) { |
0 | 346 |
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
|
347 |
|
2639 | 348 |
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
|
349 |
|
0 | 350 |
i->last_mo_production[1] += cw; |
351 |
||
352 |
am = MoveGoodsToStation(i->xy, i->width, i->height, i->produced_cargo[1], cw); |
|
353 |
i->last_mo_transported[1] += am; |
|
354 |
} |
|
355 |
} |
|
356 |
||
357 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
358 |
static void AnimateTile_Industry(TileIndex tile) |
0 | 359 |
{ |
3331 | 360 |
byte m; |
0 | 361 |
|
3331 | 362 |
switch (GetIndustryGfx(tile)) { |
3545
3e66bf329257
(svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come
belugas
parents:
3538
diff
changeset
|
363 |
case GFX_SUGAR_MINE_SIEVE: |
0 | 364 |
if ((_tick_counter & 1) == 0) { |
2049
ad0d49c916d4
(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
|
365 |
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
|
366 |
|
2952 | 367 |
switch (m & 7) { |
4434
4175805666a5
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4403
diff
changeset
|
368 |
case 2: SndPlayTileFx(SND_2D_RIP_2, tile); break; |
541 | 369 |
case 6: SndPlayTileFx(SND_29_RIP, tile); break; |
0 | 370 |
} |
371 |
||
372 |
if (m >= 96) { |
|
373 |
m = 0; |
|
374 |
DeleteAnimatedTile(tile); |
|
375 |
} |
|
2049
ad0d49c916d4
(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
|
376 |
_m[tile].m3 = m; |
0 | 377 |
|
378 |
MarkTileDirtyByTile(tile); |
|
379 |
} |
|
380 |
break; |
|
381 |
||
3545
3e66bf329257
(svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come
belugas
parents:
3538
diff
changeset
|
382 |
case GFX_TOFFEE_QUARY: |
0 | 383 |
if ((_tick_counter & 3) == 0) { |
2049
ad0d49c916d4
(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
|
384 |
m = _m[tile].m3; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
385 |
|
0 | 386 |
if (_industry_anim_offs[m] == 0xFF) { |
541 | 387 |
SndPlayTileFx(SND_30_CARTOON_SOUND, tile); |
0 | 388 |
} |
389 |
||
390 |
if (++m >= 70) { |
|
391 |
m = 0; |
|
392 |
DeleteAnimatedTile(tile); |
|
393 |
} |
|
2049
ad0d49c916d4
(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
|
394 |
_m[tile].m3 = m; |
0 | 395 |
|
396 |
MarkTileDirtyByTile(tile); |
|
397 |
} |
|
398 |
break; |
|
399 |
||
3545
3e66bf329257
(svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come
belugas
parents:
3538
diff
changeset
|
400 |
case GFX_BUBBLE_CATCHER: |
0 | 401 |
if ((_tick_counter&1) == 0) { |
2049
ad0d49c916d4
(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
|
402 |
m = _m[tile].m3; |
0 | 403 |
|
404 |
if (++m >= 40) { |
|
405 |
m = 0; |
|
406 |
DeleteAnimatedTile(tile); |
|
407 |
} |
|
2049
ad0d49c916d4
(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
|
408 |
_m[tile].m3 = m; |
0 | 409 |
|
410 |
MarkTileDirtyByTile(tile); |
|
411 |
} |
|
412 |
break; |
|
413 |
||
414 |
// Sparks on a coal plant |
|
3545
3e66bf329257
(svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come
belugas
parents:
3538
diff
changeset
|
415 |
case GFX_POWERPLANT_SPARKS: |
0 | 416 |
if ((_tick_counter & 3) == 0) { |
2360
09e42e4ee139
(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
|
417 |
m = _m[tile].m1; |
2663 | 418 |
if (GB(m, 2, 5) == 6) { |
419 |
SB(_m[tile].m1, 2, 5, 0); |
|
0 | 420 |
DeleteAnimatedTile(tile); |
421 |
} else { |
|
2360
09e42e4ee139
(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
|
422 |
_m[tile].m1 = m + (1<<2); |
0 | 423 |
MarkTileDirtyByTile(tile); |
424 |
} |
|
425 |
} |
|
426 |
break; |
|
427 |
||
3545
3e66bf329257
(svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come
belugas
parents:
3538
diff
changeset
|
428 |
case GFX_TOY_FACTORY: |
0 | 429 |
if ((_tick_counter & 1) == 0) { |
2049
ad0d49c916d4
(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
|
430 |
m = _m[tile].m3 + 1; |
0 | 431 |
|
432 |
if (m == 1) { |
|
541 | 433 |
SndPlayTileFx(SND_2C_MACHINERY, tile); |
0 | 434 |
} else if (m == 23) { |
541 | 435 |
SndPlayTileFx(SND_2B_COMEDY_HIT, tile); |
0 | 436 |
} else if (m == 28) { |
541 | 437 |
SndPlayTileFx(SND_2A_EXTRACT_AND_POP, tile); |
0 | 438 |
} |
439 |
||
3538
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
440 |
if (m >= 50) { |
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
441 |
int n = GetIndustryAnimationLoop(tile) + 1; |
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
442 |
m = 0; |
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
443 |
if (n >= 8) { |
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
444 |
n = 0; |
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
445 |
DeleteAnimatedTile(tile); |
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
446 |
} |
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
447 |
SetIndustryAnimationLoop(tile, n); |
0 | 448 |
} |
2049
ad0d49c916d4
(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
|
449 |
_m[tile].m3 = m; |
0 | 450 |
MarkTileDirtyByTile(tile); |
451 |
} |
|
452 |
break; |
|
453 |
||
454 |
case 148: case 149: case 150: case 151: |
|
455 |
case 152: case 153: case 154: case 155: |
|
456 |
if ((_tick_counter & 3) == 0) { |
|
3499
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
457 |
IndustryGfx gfx = GetIndustryGfx(tile); |
0 | 458 |
|
3331 | 459 |
gfx = (gfx < 155) ? gfx + 1 : 148; |
460 |
SetIndustryGfx(tile, gfx); |
|
0 | 461 |
MarkTileDirtyByTile(tile); |
462 |
} |
|
463 |
break; |
|
464 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
465 |
case GFX_OILWELL_ANIMATED_1: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
466 |
case GFX_OILWELL_ANIMATED_2: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
467 |
case GFX_OILWELL_ANIMATED_3: |
0 | 468 |
if ((_tick_counter & 7) == 0) { |
469 |
bool b = CHANCE16(1,7); |
|
3499
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
470 |
IndustryGfx gfx = GetIndustryGfx(tile); |
3331 | 471 |
|
472 |
m = GB(_m[tile].m1, 0, 2) + 1; |
|
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
473 |
if (m == 4 && (m = 0, ++gfx) == GFX_OILWELL_ANIMATED_3 + 1 && (gfx = GFX_OILWELL_ANIMATED_1, b)) { |
2360
09e42e4ee139
(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
|
474 |
_m[tile].m1 = 0x83; |
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
475 |
SetIndustryGfx(tile, GFX_OILWELL_NOT_ANIMATED); |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
476 |
DeleteAnimatedTile(tile); |
0 | 477 |
} else { |
2663 | 478 |
SB(_m[tile].m1, 0, 2, m); |
3331 | 479 |
SetIndustryGfx(tile, gfx); |
0 | 480 |
MarkTileDirtyByTile(tile); |
481 |
} |
|
482 |
} |
|
483 |
break; |
|
484 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
485 |
case GFX_COAL_MINE_TOWER_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
486 |
case GFX_COPPER_MINE_TOWER_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
487 |
case GFX_GOLD_MINE_TOWER_ANIMATED: { |
0 | 488 |
int state = _tick_counter & 0x7FF; |
489 |
||
490 |
if ((state -= 0x400) < 0) |
|
491 |
return; |
|
492 |
||
493 |
if (state < 0x1A0) { |
|
494 |
if (state < 0x20 || state >= 0x180) { |
|
2360
09e42e4ee139
(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
|
495 |
if (!(_m[tile].m1 & 0x40)) { |
09e42e4ee139
(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
|
496 |
_m[tile].m1 |= 0x40; |
541 | 497 |
SndPlayTileFx(SND_0B_MINING_MACHINERY, tile); |
0 | 498 |
} |
499 |
if (state & 7) |
|
500 |
return; |
|
501 |
} else { |
|
502 |
if (state & 3) |
|
503 |
return; |
|
504 |
} |
|
2360
09e42e4ee139
(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
|
505 |
m = (_m[tile].m1 + 1) | 0x40; |
0 | 506 |
if (m > 0xC2) m = 0xC0; |
2360
09e42e4ee139
(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
|
507 |
_m[tile].m1 = m; |
0 | 508 |
MarkTileDirtyByTile(tile); |
509 |
} else if (state >= 0x200 && state < 0x3A0) { |
|
510 |
int i; |
|
511 |
i = (state < 0x220 || state >= 0x380) ? 7 : 3; |
|
512 |
if (state & i) |
|
513 |
return; |
|
514 |
||
2360
09e42e4ee139
(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
|
515 |
m = (_m[tile].m1 & 0xBF) - 1; |
0 | 516 |
if (m < 0x80) m = 0x82; |
2360
09e42e4ee139
(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
|
517 |
_m[tile].m1 = m; |
0 | 518 |
MarkTileDirtyByTile(tile); |
519 |
} |
|
520 |
} break; |
|
521 |
} |
|
522 |
} |
|
523 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
524 |
static void CreateIndustryEffectSmoke(TileIndex tile) |
0 | 525 |
{ |
3773
996897ffc8ea
(svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places
tron
parents:
3689
diff
changeset
|
526 |
uint x = TileX(tile) * TILE_SIZE; |
996897ffc8ea
(svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places
tron
parents:
3689
diff
changeset
|
527 |
uint y = TileY(tile) * TILE_SIZE; |
996897ffc8ea
(svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places
tron
parents:
3689
diff
changeset
|
528 |
uint z = GetTileMaxZ(tile); |
3094 | 529 |
|
3773
996897ffc8ea
(svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places
tron
parents:
3689
diff
changeset
|
530 |
CreateEffectVehicle(x + 15, y + 14, z + 59, EV_CHIMNEY_SMOKE); |
0 | 531 |
} |
532 |
||
3495
f7d3ae07f4aa
(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
|
533 |
static void MakeIndustryTileBigger(TileIndex tile) |
0 | 534 |
{ |
3495
f7d3ae07f4aa
(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
|
535 |
byte cnt = GetIndustryConstructionCounter(tile) + 1; |
f7d3ae07f4aa
(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
|
536 |
byte stage; |
0 | 537 |
|
3495
f7d3ae07f4aa
(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
|
538 |
if (cnt != 4) { |
f7d3ae07f4aa
(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
|
539 |
SetIndustryConstructionCounter(tile, cnt); |
0 | 540 |
return; |
541 |
} |
|
542 |
||
3495
f7d3ae07f4aa
(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
|
543 |
stage = GetIndustryConstructionStage(tile) + 1; |
f7d3ae07f4aa
(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
|
544 |
SetIndustryConstructionCounter(tile, 0); |
f7d3ae07f4aa
(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
|
545 |
SetIndustryConstructionStage(tile, stage); |
f7d3ae07f4aa
(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
|
546 |
if (stage == 3) { |
f7d3ae07f4aa
(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
|
547 |
SetIndustryCompleted(tile, true); |
f7d3ae07f4aa
(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
|
548 |
} |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
549 |
|
0 | 550 |
MarkTileDirtyByTile(tile); |
551 |
||
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
552 |
if (!IsIndustryCompleted(tile)) return; |
0 | 553 |
|
3331 | 554 |
switch (GetIndustryGfx(tile)) { |
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
555 |
case GFX_POWERPLANT_CHIMNEY: |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
556 |
CreateIndustryEffectSmoke(tile); |
0 | 557 |
break; |
558 |
||
4607
2215d3175ad1
(svn r6459) - Fix (r6433): An enum mixup caused oilrigs to not have a station part. Thanks to Znuff for pointing out.
peter1138
parents:
4587
diff
changeset
|
559 |
case GFX_OILRIG_1: |
2215d3175ad1
(svn r6459) - Fix (r6433): An enum mixup caused oilrigs to not have a station part. Thanks to Znuff for pointing out.
peter1138
parents:
4587
diff
changeset
|
560 |
if (GetIndustryGfx(tile + TileDiffXY(0, 1)) == GFX_OILRIG_1) BuildOilRig(tile); |
0 | 561 |
break; |
562 |
||
3545
3e66bf329257
(svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come
belugas
parents:
3538
diff
changeset
|
563 |
case GFX_TOY_FACTORY: |
3e66bf329257
(svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come
belugas
parents:
3538
diff
changeset
|
564 |
case GFX_BUBBLE_CATCHER: |
3e66bf329257
(svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come
belugas
parents:
3538
diff
changeset
|
565 |
case GFX_TOFFEE_QUARY: |
2049
ad0d49c916d4
(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
|
566 |
_m[tile].m3 = 0; |
3538
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
567 |
SetIndustryAnimationLoop(tile, 0); |
0 | 568 |
break; |
569 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
570 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_1: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
571 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_2: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
572 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_3: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
573 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_4: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
574 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_5: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
575 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_6: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
576 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_7: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
577 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_8: |
0 | 578 |
AddAnimatedTile(tile); |
579 |
break; |
|
580 |
} |
|
581 |
} |
|
582 |
||
583 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
584 |
static void TileLoopIndustry_BubbleGenerator(TileIndex tile) |
0 | 585 |
{ |
586 |
int dir; |
|
587 |
Vehicle *v; |
|
588 |
static const int8 _tileloop_ind_case_161[12] = { |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
589 |
11, 0, -4, -14, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
590 |
-4, -10, -4, 1, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
591 |
49, 59, 60, 65, |
0 | 592 |
}; |
593 |
||
541 | 594 |
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
|
595 |
|
0 | 596 |
dir = Random() & 3; |
597 |
||
598 |
v = CreateEffectVehicleAbove( |
|
3421
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3418
diff
changeset
|
599 |
TileX(tile) * TILE_SIZE + _tileloop_ind_case_161[dir + 0], |
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3418
diff
changeset
|
600 |
TileY(tile) * TILE_SIZE + _tileloop_ind_case_161[dir + 4], |
0 | 601 |
_tileloop_ind_case_161[dir + 8], |
1359
8ba976aed634
(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
|
602 |
EV_BUBBLE |
0 | 603 |
); |
604 |
||
2639 | 605 |
if (v != NULL) v->u.special.unk2 = dir; |
0 | 606 |
} |
607 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
608 |
static void TileLoop_Industry(TileIndex tile) |
0 | 609 |
{ |
3499
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
610 |
IndustryGfx newgfx; |
0 | 611 |
|
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
612 |
if (!IsIndustryCompleted(tile)) { |
3495
f7d3ae07f4aa
(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
|
613 |
MakeIndustryTileBigger(tile); |
0 | 614 |
return; |
615 |
} |
|
616 |
||
2639 | 617 |
if (_game_mode == GM_EDITOR) return; |
0 | 618 |
|
619 |
TransportIndustryGoods(tile); |
|
620 |
||
3494
cee53fba309a
(svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections
celestar
parents:
3491
diff
changeset
|
621 |
newgfx = _industry_section_animation_next[GetIndustryGfx(tile)]; |
3331 | 622 |
if (newgfx != 255) { |
3495
f7d3ae07f4aa
(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
|
623 |
ResetIndustryConstructionStage(tile); |
3331 | 624 |
SetIndustryGfx(tile, newgfx); |
0 | 625 |
MarkTileDirtyByTile(tile); |
626 |
return; |
|
627 |
} |
|
628 |
||
3331 | 629 |
#define SET_AND_ANIMATE(tile, a, b) { SetIndustryGfx(tile, a); _m[tile].m1 = b; AddAnimatedTile(tile); } |
630 |
#define SET_AND_UNANIMATE(tile, a, b) { SetIndustryGfx(tile, a); _m[tile].m1 = b; DeleteAnimatedTile(tile); } |
|
0 | 631 |
|
3331 | 632 |
switch (GetIndustryGfx(tile)) { |
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
633 |
case GFX_OILRIG_1: // coast line at oilrigs |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
634 |
case GFX_OILRIG_2: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
635 |
case GFX_OILRIG_3: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
636 |
case GFX_OILRIG_4: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
637 |
case GFX_OILRIG_5: |
43
3b93861c5478
(svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel)
dominik
parents:
39
diff
changeset
|
638 |
TileLoop_Water(tile); |
3b93861c5478
(svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel)
dominik
parents:
39
diff
changeset
|
639 |
break; |
3b93861c5478
(svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel)
dominik
parents:
39
diff
changeset
|
640 |
|
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
641 |
case GFX_COAL_MINE_TOWER_NOT_ANIMATED: |
0 | 642 |
if (!(_tick_counter & 0x400) && CHANCE16(1,2)) |
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
643 |
SET_AND_ANIMATE(tile, GFX_COAL_MINE_TOWER_ANIMATED, 0x80); |
0 | 644 |
break; |
645 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
646 |
case GFX_COPPER_MINE_TOWER_NOT_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
647 |
if (!(_tick_counter & 0x400) && CHANCE16(1,2)) |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
648 |
SET_AND_ANIMATE(tile, GFX_COPPER_MINE_TOWER_ANIMATED, 0x80); |
0 | 649 |
break; |
650 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
651 |
case GFX_GOLD_MINE_TOWER_NOT_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
652 |
if (!(_tick_counter & 0x400) && CHANCE16(1,2)) |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
653 |
SET_AND_ANIMATE(tile, GFX_GOLD_MINE_TOWER_ANIMATED, 0x80); |
0 | 654 |
break; |
655 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
656 |
case GFX_OILWELL_NOT_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
657 |
if (CHANCE16(1,6)) |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
658 |
SET_AND_ANIMATE(tile, GFX_OILWELL_ANIMATED_1, 0x80); |
0 | 659 |
break; |
660 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
661 |
case GFX_COAL_MINE_TOWER_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
662 |
if (!(_tick_counter & 0x400)) |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
663 |
SET_AND_UNANIMATE(tile, GFX_COAL_MINE_TOWER_NOT_ANIMATED, 0x83); |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
664 |
break; |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
665 |
|
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
666 |
case GFX_COPPER_MINE_TOWER_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
667 |
if (!(_tick_counter & 0x400)) |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
668 |
SET_AND_UNANIMATE(tile, GFX_COPPER_MINE_TOWER_NOT_ANIMATED, 0x83); |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
669 |
break; |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
670 |
|
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
671 |
case GFX_GOLD_MINE_TOWER_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
672 |
if (!(_tick_counter & 0x400)) |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
673 |
SET_AND_UNANIMATE(tile, GFX_GOLD_MINE_TOWER_NOT_ANIMATED, 0x83); |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
674 |
break; |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
675 |
|
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
676 |
case GFX_POWERPLANT_SPARKS: |
0 | 677 |
if (CHANCE16(1,3)) { |
541 | 678 |
SndPlayTileFx(SND_0C_ELECTRIC_SPARK, tile); |
0 | 679 |
AddAnimatedTile(tile); |
680 |
} |
|
681 |
break; |
|
682 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
683 |
case GFX_COPPER_MINE_CHIMNEY: |
3421
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3418
diff
changeset
|
684 |
CreateEffectVehicleAbove(TileX(tile) * TILE_SIZE + 6, TileY(tile) * TILE_SIZE + 6, 43, EV_SMOKE); |
2639 | 685 |
break; |
0 | 686 |
|
687 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
688 |
case GFX_TOY_FACTORY: { |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
689 |
Industry *i = GetIndustryByTile(tile); |
0 | 690 |
if (i->was_cargo_delivered) { |
691 |
i->was_cargo_delivered = false; |
|
3538
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
692 |
SetIndustryAnimationLoop(tile, 0); |
0 | 693 |
AddAnimatedTile(tile); |
694 |
} |
|
695 |
} |
|
696 |
break; |
|
697 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
698 |
case GFX_BUBBLE_GENERATOR: |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
699 |
TileLoopIndustry_BubbleGenerator(tile); |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
700 |
break; |
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
701 |
|
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
702 |
case GFX_TOFFEE_QUARY: |
0 | 703 |
AddAnimatedTile(tile); |
704 |
break; |
|
705 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
706 |
case GFX_SUGAR_MINE_SIEVE: |
2639 | 707 |
if (CHANCE16(1, 3)) AddAnimatedTile(tile); |
0 | 708 |
break; |
709 |
} |
|
710 |
} |
|
711 |
||
712 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
713 |
static void ClickTile_Industry(TileIndex tile) |
0 | 714 |
{ |
3314
b8b234d4584f
(svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile
tron
parents:
3296
diff
changeset
|
715 |
ShowIndustryViewWindow(GetIndustryIndex(tile)); |
0 | 716 |
} |
717 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
718 |
static uint32 GetTileTrackStatus_Industry(TileIndex tile, TransportType mode) |
0 | 719 |
{ |
720 |
return 0; |
|
721 |
} |
|
722 |
||
3344
d86c852715fa
(svn r4128) - CodeChange: Add proper semantics for CargoID for such variables instead of using the general byte-type.
Darkvater
parents:
3338
diff
changeset
|
723 |
static void GetProducedCargo_Industry(TileIndex tile, CargoID *b) |
0 | 724 |
{ |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
725 |
const Industry *i = GetIndustryByTile(tile); |
2630 | 726 |
|
0 | 727 |
b[0] = i->produced_cargo[0]; |
728 |
b[1] = i->produced_cargo[1]; |
|
729 |
} |
|
730 |
||
2436
177cb6a8339f
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2360
diff
changeset
|
731 |
static void ChangeTileOwner_Industry(TileIndex tile, PlayerID old_player, PlayerID new_player) |
0 | 732 |
{ |
733 |
/* not used */ |
|
734 |
} |
|
735 |
||
736 |
static const byte _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6}; |
|
737 |
||
1048 | 738 |
static bool IsBadFarmFieldTile(TileIndex tile) |
0 | 739 |
{ |
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1209
diff
changeset
|
740 |
switch (GetTileType(tile)) { |
3447 | 741 |
case MP_CLEAR: return IsClearGround(tile, CLEAR_FIELDS) || IsClearGround(tile, CLEAR_SNOW); |
2955
27221592ebbc
(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
|
742 |
case MP_TREES: return false; |
27221592ebbc
(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
|
743 |
default: return true; |
0 | 744 |
} |
745 |
} |
|
746 |
||
1048 | 747 |
static bool IsBadFarmFieldTile2(TileIndex tile) |
0 | 748 |
{ |
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1209
diff
changeset
|
749 |
switch (GetTileType(tile)) { |
3447 | 750 |
case MP_CLEAR: return IsClearGround(tile, CLEAR_SNOW); |
2955
27221592ebbc
(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
|
751 |
case MP_TREES: return false; |
27221592ebbc
(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
|
752 |
default: return true; |
0 | 753 |
} |
754 |
} |
|
755 |
||
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
756 |
static void SetupFarmFieldFence(TileIndex tile, int size, byte type, Axis direction) |
0 | 757 |
{ |
758 |
do { |
|
759 |
tile = TILE_MASK(tile); |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
760 |
|
1035
0a170deb6e33
(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
|
761 |
if (IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES)) { |
2979
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
762 |
byte or = type; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
763 |
|
2637
8807e6a63f89
(svn r3179) - RandomRange() and RandomTile() instead of home brewed versions
tron
parents:
2630
diff
changeset
|
764 |
if (or == 1 && CHANCE16(1, 7)) or = 2; |
0 | 765 |
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
766 |
if (direction == AXIS_X) { |
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
767 |
SetFenceSE(tile, or); |
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
768 |
} else { |
2979
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
769 |
SetFenceSW(tile, or); |
0 | 770 |
} |
771 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
772 |
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
773 |
tile += (direction == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1)); |
0 | 774 |
} while (--size); |
775 |
} |
|
776 |
||
4330
7306bda145ab
(svn r6005) -Cleanup: introduce IndustryID and use it
rubidium
parents:
4329
diff
changeset
|
777 |
static void PlantFarmField(TileIndex tile, IndustryID industry) |
0 | 778 |
{ |
779 |
uint size_x, size_y; |
|
780 |
uint32 r; |
|
2133 | 781 |
uint count; |
2979
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
782 |
uint counter; |
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
783 |
uint field_type; |
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
784 |
int type; |
0 | 785 |
|
786 |
if (_opt.landscape == LT_HILLY) { |
|
3422
12cdb13ddb56
(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
|
787 |
if (GetTileZ(tile) + TILE_HEIGHT * 2 >= _opt.snow_line) |
0 | 788 |
return; |
789 |
} |
|
790 |
||
791 |
/* determine field size */ |
|
792 |
r = (Random() & 0x303) + 0x404; |
|
793 |
if (_opt.landscape == LT_HILLY) r += 0x404; |
|
2150
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2148
diff
changeset
|
794 |
size_x = GB(r, 0, 8); |
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2148
diff
changeset
|
795 |
size_y = GB(r, 8, 8); |
0 | 796 |
|
797 |
/* offset tile to match size */ |
|
1981 | 798 |
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
|
799 |
|
0 | 800 |
/* check the amount of bad tiles */ |
801 |
count = 0; |
|
802 |
BEGIN_TILE_LOOP(cur_tile, size_x, size_y, tile) |
|
803 |
cur_tile = TILE_MASK(cur_tile); |
|
804 |
count += IsBadFarmFieldTile(cur_tile); |
|
805 |
END_TILE_LOOP(cur_tile, size_x, size_y, tile) |
|
2133 | 806 |
if (count * 2 >= size_x * size_y) return; |
0 | 807 |
|
808 |
/* determine type of field */ |
|
809 |
r = Random(); |
|
2979
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
810 |
counter = GB(r, 5, 3); |
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
811 |
field_type = GB(r, 8, 8) * 9 >> 8; |
0 | 812 |
|
813 |
/* make field */ |
|
814 |
BEGIN_TILE_LOOP(cur_tile, size_x, size_y, tile) |
|
815 |
cur_tile = TILE_MASK(cur_tile); |
|
816 |
if (!IsBadFarmFieldTile2(cur_tile)) { |
|
4328
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
817 |
MakeField(cur_tile, field_type, industry); |
2979
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
818 |
SetClearCounter(cur_tile, counter); |
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
819 |
MarkTileDirtyByTile(cur_tile); |
0 | 820 |
} |
821 |
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
|
822 |
|
0 | 823 |
type = 3; |
824 |
if (_opt.landscape != LT_HILLY && _opt.landscape != LT_DESERT) { |
|
825 |
type = _plantfarmfield_type[Random() & 0xF]; |
|
826 |
} |
|
827 |
||
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
828 |
SetupFarmFieldFence(tile - TileDiffXY(1, 0), size_y, type, AXIS_Y); |
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
829 |
SetupFarmFieldFence(tile - TileDiffXY(0, 1), size_x, type, AXIS_X); |
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
830 |
SetupFarmFieldFence(tile + TileDiffXY(size_x - 1, 0), size_y, type, AXIS_Y); |
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
831 |
SetupFarmFieldFence(tile + TileDiffXY(0, size_y - 1), size_x, type, AXIS_X); |
0 | 832 |
} |
833 |
||
4328
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
834 |
void PlantRandomFarmField(const Industry *i) |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
835 |
{ |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
836 |
int x = i->width / 2 + Random() % 31 - 16; |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
837 |
int y = i->height / 2 + Random() % 31 - 16; |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
838 |
|
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
839 |
TileIndex tile = TileAddWrap(i->xy, x, y); |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
840 |
|
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
841 |
if (tile != INVALID_TILE) PlantFarmField(tile, i->index); |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
842 |
} |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
843 |
|
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
844 |
static void MaybePlantFarmField(const Industry *i) |
0 | 845 |
{ |
4328
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
846 |
if (CHANCE16(1, 8)) PlantRandomFarmField(i); |
0 | 847 |
} |
848 |
||
5118
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
849 |
/** |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
850 |
* Search callback function for ChopLumberMillTrees |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
851 |
* @param tile to test |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
852 |
* @param data that is passed by the caller. In this case, nothing |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
853 |
* @result of the test |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
854 |
*/ |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
855 |
static bool SearchLumberMillTrees(TileIndex tile, uint32 data) |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
856 |
{ |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
857 |
if (IsTileType(tile, MP_TREES)) { |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
858 |
PlayerID old_player = _current_player; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
859 |
/* found a tree */ |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
860 |
|
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
861 |
_current_player = OWNER_NONE; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
862 |
_industry_sound_ctr = 1; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
863 |
_industry_sound_tile = tile; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
864 |
SndPlayTileFx(SND_38_CHAINSAW, tile); |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
865 |
|
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
866 |
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
867 |
SetTropicZone(tile, TROPICZONE_INVALID); |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
868 |
|
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
869 |
_current_player = old_player; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
870 |
return true; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
871 |
} |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
872 |
return false; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
873 |
} |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
874 |
|
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
875 |
/** |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
876 |
* Perform a circular search around the Lumber Mill in order to find trees to cut |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
877 |
* @param i industry |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
878 |
*/ |
0 | 879 |
static void ChopLumberMillTrees(Industry *i) |
880 |
{ |
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
881 |
TileIndex tile = i->xy; |
2639 | 882 |
|
5118
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
883 |
if (!IsIndustryCompleted(tile)) return; ///< Can't proceed if not completed |
0 | 884 |
|
5118
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
885 |
if (CircularTileSearch(tile, 40, SearchLumberMillTrees, 0)) ///< 40x40 tiles to search |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
886 |
i->cargo_waiting[0] = min(0xffff, i->cargo_waiting[0] + 45); ///< Found a tree, add according value to waiting cargo |
0 | 887 |
} |
888 |
||
889 |
static const byte _industry_sounds[37][2] = { |
|
890 |
{0}, |
|
891 |
{0}, |
|
541 | 892 |
{1, SND_28_SAWMILL}, |
0 | 893 |
{0}, |
894 |
{0}, |
|
895 |
{0}, |
|
541 | 896 |
{1, SND_03_FACTORY_WHISTLE}, |
897 |
{1, SND_03_FACTORY_WHISTLE}, |
|
0 | 898 |
{0}, |
541 | 899 |
{3, SND_24_SHEEP}, |
0 | 900 |
{0}, |
901 |
{0}, |
|
902 |
{0}, |
|
903 |
{0}, |
|
541 | 904 |
{1, SND_28_SAWMILL}, |
0 | 905 |
{0}, |
906 |
{0}, |
|
907 |
{0}, |
|
908 |
{0}, |
|
909 |
{0}, |
|
910 |
{0}, |
|
911 |
{0}, |
|
912 |
{0}, |
|
541 | 913 |
{1, SND_03_FACTORY_WHISTLE}, |
0 | 914 |
{0}, |
915 |
{0}, |
|
916 |
{0}, |
|
917 |
{0}, |
|
918 |
{0}, |
|
919 |
{0}, |
|
920 |
{0}, |
|
921 |
{0}, |
|
541 | 922 |
{1, SND_33_PLASTIC_MINE}, |
0 | 923 |
{0}, |
924 |
{0}, |
|
925 |
{0}, |
|
926 |
{0}, |
|
927 |
}; |
|
928 |
||
929 |
||
930 |
static void ProduceIndustryGoods(Industry *i) |
|
931 |
{ |
|
932 |
uint32 r; |
|
933 |
uint num; |
|
934 |
||
935 |
/* play a sound? */ |
|
936 |
if ((i->counter & 0x3F) == 0) { |
|
937 |
if (CHANCE16R(1,14,r) && (num=_industry_sounds[i->type][0]) != 0) { |
|
938 |
SndPlayTileFx( |
|
939 |
_industry_sounds[i->type][1] + (((r >> 16) * num) >> 16), |
|
940 |
i->xy); |
|
941 |
} |
|
942 |
} |
|
943 |
||
944 |
i->counter--; |
|
945 |
||
946 |
/* produce some cargo */ |
|
947 |
if ((i->counter & 0xFF) == 0) { |
|
948 |
i->cargo_waiting[0] = min(0xffff, i->cargo_waiting[0] + i->production_rate[0]); |
|
949 |
i->cargo_waiting[1] = min(0xffff, i->cargo_waiting[1] + i->production_rate[1]); |
|
950 |
||
2639 | 951 |
if (i->type == IT_FARM) { |
0 | 952 |
MaybePlantFarmField(i); |
2639 | 953 |
} else if (i->type == IT_LUMBER_MILL && (i->counter & 0x1FF) == 0) { |
0 | 954 |
ChopLumberMillTrees(i); |
2639 | 955 |
} |
0 | 956 |
} |
957 |
} |
|
958 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
959 |
void OnTick_Industry(void) |
0 | 960 |
{ |
961 |
Industry *i; |
|
962 |
||
963 |
if (_industry_sound_ctr != 0) { |
|
964 |
_industry_sound_ctr++; |
|
965 |
||
966 |
if (_industry_sound_ctr == 75) { |
|
541 | 967 |
SndPlayTileFx(SND_37_BALLOON_SQUEAK, _industry_sound_tile); |
0 | 968 |
} 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
|
969 |
_industry_sound_ctr = 0; |
541 | 970 |
SndPlayTileFx(SND_36_CARTOON_CRASH, _industry_sound_tile); |
0 | 971 |
} |
972 |
} |
|
973 |
||
2639 | 974 |
if (_game_mode == GM_EDITOR) return; |
0 | 975 |
|
830
8114845804c9
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
817
diff
changeset
|
976 |
FOR_ALL_INDUSTRIES(i) { |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
977 |
ProduceIndustryGoods(i); |
0 | 978 |
} |
979 |
} |
|
980 |
||
981 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
982 |
static bool CheckNewIndustry_NULL(TileIndex tile) |
0 | 983 |
{ |
984 |
return true; |
|
985 |
} |
|
986 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
987 |
static bool CheckNewIndustry_Forest(TileIndex tile) |
0 | 988 |
{ |
989 |
if (_opt.landscape == LT_HILLY) { |
|
3645
86af43f87885
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3636
diff
changeset
|
990 |
if (GetTileZ(tile) < _opt.snow_line + TILE_HEIGHT * 2U) { |
0 | 991 |
_error_message = STR_4831_FOREST_CAN_ONLY_BE_PLANTED; |
992 |
return false; |
|
993 |
} |
|
994 |
} |
|
995 |
return true; |
|
996 |
} |
|
997 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
998 |
static bool CheckNewIndustry_OilRefinery(TileIndex tile) |
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
999 |
{ |
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1000 |
if (_game_mode == GM_EDITOR) return true; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1001 |
if (DistanceFromEdge(TILE_ADDXY(tile, 1, 1)) < _patches.oil_refinery_limit) return true; |
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1002 |
|
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1003 |
_error_message = STR_483B_CAN_ONLY_BE_POSITIONED; |
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1004 |
return false; |
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1005 |
} |
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1006 |
|
7
f2e623faa778
(svn r8) Fix: Automatic oil refinery generation in editor
dominik
parents:
0
diff
changeset
|
1007 |
extern bool _ignore_restrictions; |
f2e623faa778
(svn r8) Fix: Automatic oil refinery generation in editor
dominik
parents:
0
diff
changeset
|
1008 |
|
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1009 |
static bool CheckNewIndustry_OilRig(TileIndex tile) |
0 | 1010 |
{ |
2639 | 1011 |
if (_game_mode == GM_EDITOR && _ignore_restrictions) return true; |
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1012 |
if (TileHeight(tile) == 0 && |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1013 |
DistanceFromEdge(TILE_ADDXY(tile, 1, 1)) < _patches.oil_refinery_limit) return true; |
0 | 1014 |
|
1015 |
_error_message = STR_483B_CAN_ONLY_BE_POSITIONED; |
|
1016 |
return false; |
|
1017 |
} |
|
1018 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1019 |
static bool CheckNewIndustry_Farm(TileIndex tile) |
0 | 1020 |
{ |
1021 |
if (_opt.landscape == LT_HILLY) { |
|
3422
12cdb13ddb56
(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
|
1022 |
if (GetTileZ(tile) + TILE_HEIGHT * 2 >= _opt.snow_line) { |
0 | 1023 |
_error_message = STR_0239_SITE_UNSUITABLE; |
1024 |
return false; |
|
1025 |
} |
|
1026 |
} |
|
1027 |
return true; |
|
1028 |
} |
|
1029 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1030 |
static bool CheckNewIndustry_Plantation(TileIndex tile) |
0 | 1031 |
{ |
3379
ea8aa9e71328
(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
|
1032 |
if (GetTropicZone(tile) == TROPICZONE_DESERT) { |
0 | 1033 |
_error_message = STR_0239_SITE_UNSUITABLE; |
1034 |
return false; |
|
1035 |
} |
|
1036 |
||
1037 |
return true; |
|
1038 |
} |
|
1039 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1040 |
static bool CheckNewIndustry_Water(TileIndex tile) |
0 | 1041 |
{ |
3379
ea8aa9e71328
(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
|
1042 |
if (GetTropicZone(tile) != TROPICZONE_DESERT) { |
0 | 1043 |
_error_message = STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT; |
1044 |
return false; |
|
1045 |
} |
|
1046 |
||
1047 |
return true; |
|
1048 |
} |
|
1049 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1050 |
static bool CheckNewIndustry_Lumbermill(TileIndex tile) |
0 | 1051 |
{ |
3379
ea8aa9e71328
(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
|
1052 |
if (GetTropicZone(tile) != TROPICZONE_RAINFOREST) { |
0 | 1053 |
_error_message = STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST; |
1054 |
return false; |
|
1055 |
} |
|
1056 |
return true; |
|
1057 |
} |
|
1058 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1059 |
static bool CheckNewIndustry_BubbleGen(TileIndex tile) |
0 | 1060 |
{ |
3645
86af43f87885
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3636
diff
changeset
|
1061 |
return GetTileZ(tile) <= TILE_HEIGHT * 4; |
0 | 1062 |
} |
1063 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1064 |
typedef bool CheckNewIndustryProc(TileIndex tile); |
3663
50fbc1639a3f
(svn r4578) CodeChange : Cleanup of industry_cmd (Step-2).
belugas
parents:
3662
diff
changeset
|
1065 |
static CheckNewIndustryProc * const _check_new_industry_procs[CHECK_END] = { |
0 | 1066 |
CheckNewIndustry_NULL, |
1067 |
CheckNewIndustry_Forest, |
|
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1068 |
CheckNewIndustry_OilRefinery, |
0 | 1069 |
CheckNewIndustry_Farm, |
1070 |
CheckNewIndustry_Plantation, |
|
1071 |
CheckNewIndustry_Water, |
|
1072 |
CheckNewIndustry_Lumbermill, |
|
1073 |
CheckNewIndustry_BubbleGen, |
|
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1074 |
CheckNewIndustry_OilRig |
0 | 1075 |
}; |
1076 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
1077 |
static bool CheckSuitableIndustryPos(TileIndex tile) |
0 | 1078 |
{ |
926
bd4312619522
(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
|
1079 |
uint x = TileX(tile); |
bd4312619522
(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
|
1080 |
uint y = TileY(tile); |
0 | 1081 |
|
2639 | 1082 |
if (x < 2 || y < 2 || x > MapMaxX() - 3 || y > MapMaxY() - 3) { |
0 | 1083 |
_error_message = STR_0239_SITE_UNSUITABLE; |
1084 |
return false; |
|
1085 |
} |
|
1086 |
||
1087 |
return true; |
|
1088 |
} |
|
1089 |
||
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
1090 |
static const Town *CheckMultipleIndustryInTown(TileIndex tile, int type) |
0 | 1091 |
{ |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
1092 |
const Town *t; |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
1093 |
const Industry *i; |
0 | 1094 |
|
1095 |
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
|
1096 |
|
2639 | 1097 |
if (_patches.multiple_industry_per_town) return t; |
0 | 1098 |
|
830
8114845804c9
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
817
diff
changeset
|
1099 |
FOR_ALL_INDUSTRIES(i) { |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1100 |
if (i->type == (byte)type && |
0 | 1101 |
i->town == t) { |
1102 |
_error_message = STR_0287_ONLY_ONE_ALLOWED_PER_TOWN; |
|
1103 |
return NULL; |
|
1104 |
} |
|
1105 |
} |
|
1106 |
||
1107 |
return t; |
|
1108 |
} |
|
1109 |
||
3494
cee53fba309a
(svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections
celestar
parents:
3491
diff
changeset
|
1110 |
static const byte _industry_section_bits[] = { |
0 | 1111 |
16, 16, 16, 16, 16, 16, 16, 16, |
1112 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1113 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1114 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1115 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1116 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1117 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1118 |
16, 16, 4, 2, 16, 16, 16, 16, |
0 | 1119 |
16, 16, 16, 16, 16, 16, 16, 16, |
1120 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1121 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1122 |
16, 4, 2, 16, 16, 16, 16, 16, |
0 | 1123 |
16, 16, 16, 16, 16, 16, 16, 16, |
1124 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1125 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1126 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1127 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1128 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1129 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1130 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1131 |
16, 16, 16, 16, 16, 16, 16, 16, |
|
1132 |
16, 16, 16, 16, 16, 16, 16, |
|
1133 |
}; |
|
1134 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1135 |
static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable *it, int type) |
0 | 1136 |
{ |
1137 |
_error_message = STR_0239_SITE_UNSUITABLE; |
|
1138 |
||
1139 |
do { |
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
1140 |
TileIndex cur_tile = tile + ToTileIndexDiff(it->ti); |
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
1141 |
|
0 | 1142 |
if (!IsValidTile(cur_tile)) { |
3440 | 1143 |
if (it->gfx == 0xff) continue; |
0 | 1144 |
return false; |
1145 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1146 |
|
3440 | 1147 |
if (it->gfx == 0xFF) { |
3296
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1148 |
if (!IsTileType(cur_tile, MP_WATER) || |
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3585
diff
changeset
|
1149 |
GetTileSlope(cur_tile, NULL) != SLOPE_FLAT) { |
3296
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1150 |
return false; |
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1151 |
} |
0 | 1152 |
} else { |
2639 | 1153 |
if (!EnsureNoVehicle(cur_tile)) return false; |
0 | 1154 |
|
1155 |
if (type == IT_OIL_RIG) { |
|
5056
20369e09627b
(svn r7109) -Codechange: use map accessor IsClearWaterTile
belugas
parents:
4976
diff
changeset
|
1156 |
if (!IsClearWaterTile(cur_tile)) return false; |
0 | 1157 |
} else { |
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3585
diff
changeset
|
1158 |
Slope tileh; |
0 | 1159 |
|
5056
20369e09627b
(svn r7109) -Codechange: use map accessor IsClearWaterTile
belugas
parents:
4976
diff
changeset
|
1160 |
if (IsClearWaterTile(cur_tile)) return false; |
3296
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1161 |
|
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1162 |
tileh = GetTileSlope(cur_tile, NULL); |
3636
d87b21df2944
(svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents:
3585
diff
changeset
|
1163 |
if (IsSteepSlope(tileh)) return false; |
3296
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1164 |
|
4301
1352486059b3
(svn r5948) -Fix: inversed check caused oringal land-generator to put industries on mountains (tnx Darkvater)
truelight
parents:
4300
diff
changeset
|
1165 |
if (_patches.land_generator != LG_TERRAGENESIS || !_generating_world) { |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1166 |
/* It is almost impossible to have a fully flat land in TG, so what we |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1167 |
* do is that we check if we can make the land flat later on. See |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1168 |
* CheckIfCanLevelIndustryPlatform(). */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1169 |
if (tileh != SLOPE_FLAT) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1170 |
Slope t; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1171 |
byte bits = _industry_section_bits[it->gfx]; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1172 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1173 |
if (bits & 0x10) return false; |
0 | 1174 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1175 |
t = ComplementSlope(tileh); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1176 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1177 |
if (bits & 1 && (t & SLOPE_NW)) return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1178 |
if (bits & 2 && (t & SLOPE_NE)) return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1179 |
if (bits & 4 && (t & SLOPE_SW)) return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1180 |
if (bits & 8 && (t & SLOPE_SE)) return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1181 |
} |
0 | 1182 |
} |
1183 |
||
3499
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
1184 |
if (type == IT_BANK_TEMP) { |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1185 |
if (!IsTileType(cur_tile, MP_HOUSE)) { |
0 | 1186 |
_error_message = STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS; |
1187 |
return false; |
|
1188 |
} |
|
3499
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
1189 |
} else if (type == IT_BANK_TROPIC_ARCTIC) { |
3296
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1190 |
if (!IsTileType(cur_tile, MP_HOUSE)) { |
0 | 1191 |
_error_message = STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS; |
1192 |
return false; |
|
1193 |
} |
|
1194 |
} else if (type == IT_TOY_SHOP) { |
|
3296
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1195 |
if (!IsTileType(cur_tile, MP_HOUSE)) goto do_clear; |
0 | 1196 |
} else if (type == IT_WATER_TOWER) { |
3296
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1197 |
if (!IsTileType(cur_tile, MP_HOUSE)) { |
0 | 1198 |
_error_message = STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS; |
1199 |
return false; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1200 |
} |
0 | 1201 |
} else { |
1202 |
do_clear: |
|
3491
4c8427796c64
(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
|
1203 |
if (CmdFailed(DoCommand(cur_tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR))) |
0 | 1204 |
return false; |
1205 |
} |
|
1206 |
} |
|
1207 |
} |
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
1208 |
} while ((++it)->ti.x != -0x80); |
0 | 1209 |
|
1210 |
return true; |
|
1211 |
} |
|
1212 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1213 |
static bool CheckIfIndustryIsAllowed(TileIndex tile, int type, const Town *t) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1214 |
{ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1215 |
if (type == IT_BANK_TEMP && t->population < 1200) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1216 |
_error_message = STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1217 |
return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1218 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1219 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1220 |
if (type == IT_TOY_SHOP && DistanceMax(t->xy, tile) > 9) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1221 |
_error_message = STR_0239_SITE_UNSUITABLE; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1222 |
return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1223 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1224 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1225 |
return true; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1226 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1227 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1228 |
static bool CheckCanTerraformSurroundingTiles(TileIndex tile, uint height, int internal) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1229 |
{ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1230 |
int size_x, size_y; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1231 |
uint curh; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1232 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1233 |
size_x = 2; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1234 |
size_y = 2; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1235 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1236 |
/* Check if we don't leave the map */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1237 |
if (TileX(tile) == 0 || TileY(tile) == 0 || GetTileType(tile) == MP_VOID) return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1238 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1239 |
tile += TileDiffXY(-1, -1); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1240 |
BEGIN_TILE_LOOP(tile_walk, size_x, size_y, tile) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1241 |
curh = TileHeight(tile_walk); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1242 |
/* Is the tile clear? */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1243 |
if ((GetTileType(tile_walk) != MP_CLEAR) && (GetTileType(tile_walk) != MP_TREES)) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1244 |
return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1245 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1246 |
/* Don't allow too big of a change if this is the sub-tile check */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1247 |
if (internal != 0 && myabs(curh - height) > 1) return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1248 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1249 |
/* Different height, so the surrounding tiles of this tile |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1250 |
* has to be correct too (in level, or almost in level) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1251 |
* else you get a chain-reaction of terraforming. */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1252 |
if (internal == 0 && curh != height) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1253 |
if (!CheckCanTerraformSurroundingTiles(tile_walk + TileDiffXY(-1, -1), height, internal + 1)) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1254 |
return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1255 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1256 |
} END_TILE_LOOP(tile_walk, size_x, size_y, tile); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1257 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1258 |
return true; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1259 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1260 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1261 |
/** |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1262 |
* This function tries to flatten out the land below an industry, without |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1263 |
* damaging the surroundings too much. |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1264 |
*/ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1265 |
static bool CheckIfCanLevelIndustryPlatform(TileIndex tile, uint32 flags, const IndustryTileTable* it, int type) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1266 |
{ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1267 |
const int MKEND = -0x80; // used for last element in an IndustryTileTable (see build_industry.h) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1268 |
int max_x = 0; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1269 |
int max_y = 0; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1270 |
TileIndex cur_tile; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1271 |
uint size_x, size_y; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1272 |
uint h, curh; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1273 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1274 |
/* Finds dimensions of largest variant of this industry */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1275 |
do { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1276 |
if (it->ti.x > max_x) max_x = it->ti.x; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1277 |
if (it->ti.y > max_y) max_y = it->ti.y; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1278 |
} while ((++it)->ti.x != MKEND); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1279 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1280 |
/* Remember level height */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1281 |
h = TileHeight(tile); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1282 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1283 |
/* Check that all tiles in area and surrounding are clear |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1284 |
* this determines that there are no obstructing items */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1285 |
cur_tile = tile + TileDiffXY(-1, -1); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1286 |
size_x = max_x + 4; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1287 |
size_y = max_y + 4; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1288 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1289 |
/* Check if we don't leave the map */ |
4313
bbd84f6e21b0
(svn r5966) -Fix: prevent that the industry placement's terraforming checks can leave the map on the southern side
rubidium
parents:
4301
diff
changeset
|
1290 |
if (TileX(cur_tile) == 0 || TileY(cur_tile) == 0 || TileX(cur_tile) + size_x >= MapMaxX() || TileY(cur_tile) + size_y >= MapMaxY()) return false; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1291 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1292 |
BEGIN_TILE_LOOP(tile_walk, size_x, size_y, cur_tile) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1293 |
curh = TileHeight(tile_walk); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1294 |
if (curh != h) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1295 |
/* This tile needs terraforming. Check if we can do that without |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1296 |
* damaging the surroundings too much. */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1297 |
if (!CheckCanTerraformSurroundingTiles(tile_walk, h, 0)) return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1298 |
/* This is not 100% correct check, but the best we can do without modifying the map. |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1299 |
* What is missing, is if the difference in height is more than 1.. */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1300 |
if (CmdFailed(DoCommand(tile_walk, 8, (curh > h) ? 0 : 1, flags & ~DC_EXEC, CMD_TERRAFORM_LAND))) return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1301 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1302 |
} END_TILE_LOOP(tile_walk, size_x, size_y, cur_tile) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1303 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1304 |
if (flags & DC_EXEC) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1305 |
/* Terraform the land under the industry */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1306 |
BEGIN_TILE_LOOP(tile_walk, size_x, size_y, cur_tile) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1307 |
curh = TileHeight(tile_walk); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1308 |
while (curh != h) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1309 |
/* We give the terraforming for free here, because we can't calculate |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1310 |
* exact cost in the test-round, and as we all know, that will cause |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1311 |
* a nice assert if they don't match ;) */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1312 |
DoCommand(tile_walk, 8, (curh > h) ? 0 : 1, flags, CMD_TERRAFORM_LAND); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1313 |
curh += (curh > h) ? -1 : 1; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1314 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1315 |
} END_TILE_LOOP(tile_walk, size_x, size_y, cur_tile) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1316 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1317 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1318 |
return true; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1319 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1320 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1321 |
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
1322 |
static bool CheckIfTooCloseToIndustry(TileIndex tile, int type) |
0 | 1323 |
{ |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1324 |
const IndustrySpec *indspec = GetIndustrySpec(type); |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
1325 |
const Industry *i; |
0 | 1326 |
|
1327 |
// accepting industries won't be close, not even with patch |
|
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1328 |
if (_patches.same_industry_close && indspec->accepts_cargo[0] == CT_INVALID) |
0 | 1329 |
return true; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1330 |
|
830
8114845804c9
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
817
diff
changeset
|
1331 |
FOR_ALL_INDUSTRIES(i) { |
0 | 1332 |
// check if an industry that accepts the same goods is nearby |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1333 |
if (DistanceMax(tile, i->xy) <= 14 && |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1334 |
indspec->accepts_cargo[0] != CT_INVALID && |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1335 |
indspec->accepts_cargo[0] == i->accepts_cargo[0] && ( |
2639 | 1336 |
_game_mode != GM_EDITOR || |
1337 |
!_patches.same_industry_close || |
|
1338 |
!_patches.multiple_industry_per_town |
|
1339 |
)) { |
|
1340 |
_error_message = STR_INDUSTRY_TOO_CLOSE; |
|
1341 |
return false; |
|
1342 |
} |
|
0 | 1343 |
|
1344 |
// check "not close to" field. |
|
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1345 |
if ((i->type == indspec->conflicting[0] || i->type == indspec->conflicting[1] || i->type == indspec->conflicting[2]) && |
1245
768d9bc95aaa
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1214
diff
changeset
|
1346 |
DistanceMax(tile, i->xy) <= 14) { |
0 | 1347 |
_error_message = STR_INDUSTRY_TOO_CLOSE; |
1348 |
return false; |
|
1349 |
} |
|
1350 |
} |
|
1351 |
return true; |
|
1352 |
} |
|
1353 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
1354 |
static Industry *AllocateIndustry(void) |
0 | 1355 |
{ |
1356 |
Industry *i; |
|
1357 |
||
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1358 |
/* We don't use FOR_ALL here, because FOR_ALL skips invalid items. |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1359 |
* TODO - This is just a temporary stage, this will be removed. */ |
4976
a0d7f63c35b5
(svn r6979) Use the pool macros for the Industry pool
tron
parents:
4965
diff
changeset
|
1360 |
for (i = GetIndustry(0); i != NULL; i = (i->index + 1U < GetIndustryPoolSize()) ? GetIndustry(i->index + 1U) : NULL) { |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1361 |
IndustryID index = i->index; |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1362 |
|
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1363 |
if (IsValidIndustry(i)) continue; |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
909
diff
changeset
|
1364 |
|
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1365 |
memset(i, 0, sizeof(*i)); |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1366 |
i->index = index; |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1367 |
|
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1368 |
return i; |
0 | 1369 |
} |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1370 |
|
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1371 |
/* Check if we can add a block to the pool */ |
4976
a0d7f63c35b5
(svn r6979) Use the pool macros for the Industry pool
tron
parents:
4965
diff
changeset
|
1372 |
return AddBlockToPool(&_Industry_pool) ? AllocateIndustry() : NULL; |
0 | 1373 |
} |
1374 |
||
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
1375 |
static void DoCreateNewIndustry(Industry *i, TileIndex tile, int type, const IndustryTileTable *it, const Town *t, byte owner) |
0 | 1376 |
{ |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1377 |
const IndustrySpec *indspec = GetIndustrySpec(type); |
0 | 1378 |
uint32 r; |
1379 |
int j; |
|
1380 |
||
5319
65acb2e92975
(svn r7477) -Fix (7451): Allocate(Industry|Town) get called twice when trying to build an industry/town via a command, thus incrementing the number of towns/industries twice when created via a command.
rubidium
parents:
5298
diff
changeset
|
1381 |
_total_industries++; |
0 | 1382 |
i->xy = tile; |
1383 |
i->width = i->height = 0; |
|
1384 |
i->type = type; |
|
1385 |
||
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1386 |
i->produced_cargo[0] = indspec->produced_cargo[0]; |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1387 |
i->produced_cargo[1] = indspec->produced_cargo[1]; |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1388 |
i->accepts_cargo[0] = indspec->accepts_cargo[0]; |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1389 |
i->accepts_cargo[1] = indspec->accepts_cargo[1]; |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1390 |
i->accepts_cargo[2] = indspec->accepts_cargo[2]; |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1391 |
i->production_rate[0] = indspec->production_rate[0]; |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1392 |
i->production_rate[1] = indspec->production_rate[1]; |
0 | 1393 |
|
1394 |
if (_patches.smooth_economy) { |
|
1395 |
i->production_rate[0] = min((RandomRange(256) + 128) * i->production_rate[0] >> 8 , 255); |
|
1396 |
i->production_rate[1] = min((RandomRange(256) + 128) * i->production_rate[1] >> 8 , 255); |
|
1397 |
} |
|
1398 |
||
1399 |
i->town = t; |
|
1400 |
i->owner = owner; |
|
1401 |
||
2484
8e0c88a833fb
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2469
diff
changeset
|
1402 |
r = Random(); |
4942
f990abfa4438
(svn r6930) -Codechange: Move industry name into IndustrySpec
belugas
parents:
4924
diff
changeset
|
1403 |
i->random_color = GB(r, 8, 4); |
2492
3f32f9f9fd78
(svn r3018) -Fix: Fixed industry colour issue introduced in r3010.
peter1138
parents:
2484
diff
changeset
|
1404 |
i->counter = GB(r, 0, 12); |
0 | 1405 |
i->cargo_waiting[0] = 0; |
1406 |
i->cargo_waiting[1] = 0; |
|
1407 |
i->last_mo_production[0] = 0; |
|
1408 |
i->last_mo_production[1] = 0; |
|
1409 |
i->last_mo_transported[0] = 0; |
|
1410 |
i->last_mo_transported[1] = 0; |
|
1411 |
i->pct_transported[0] = 0; |
|
1412 |
i->pct_transported[1] = 0; |
|
1413 |
i->total_transported[0] = 0; |
|
1414 |
i->total_transported[1] = 0; |
|
1415 |
i->was_cargo_delivered = false; |
|
4329
9759d5c52010
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4328
diff
changeset
|
1416 |
i->last_prod_year = _cur_year; |
0 | 1417 |
i->total_production[0] = i->production_rate[0] * 8; |
1418 |
i->total_production[1] = i->production_rate[1] * 8; |
|
1419 |
||
2639 | 1420 |
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
|
1421 |
|
0 | 1422 |
i->prod_level = 0x10; |
1423 |
||
1424 |
do { |
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
1425 |
TileIndex cur_tile = tile + ToTileIndexDiff(it->ti); |
0 | 1426 |
|
3440 | 1427 |
if (it->gfx != 0xFF) { |
0 | 1428 |
byte size; |
1429 |
||
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
1430 |
size = it->ti.x; |
0 | 1431 |
if (size > i->width) i->width = size; |
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
1432 |
size = it->ti.y; |
0 | 1433 |
if (size > i->height)i->height = size; |
1434 |
||
3491
4c8427796c64
(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
|
1435 |
DoCommand(cur_tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); |
0 | 1436 |
|
3440 | 1437 |
MakeIndustry(cur_tile, i->index, it->gfx); |
3320 | 1438 |
if (_generating_world) _m[cur_tile].m1 = 0x1E; /* maturity */ |
0 | 1439 |
} |
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
1440 |
} while ((++it)->ti.x != -0x80); |
0 | 1441 |
|
1442 |
i->width++; |
|
1443 |
i->height++; |
|
1444 |
||
1445 |
if (i->type == IT_FARM || i->type == IT_FARM_2) { |
|
4328
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1446 |
for (j = 0; j != 50; j++) PlantRandomFarmField(i); |
0 | 1447 |
} |
1448 |
_industry_sort_dirty = true; |
|
1449 |
InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0); |
|
1450 |
} |
|
1451 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1452 |
static Industry *CreateNewIndustryHelper(TileIndex tile, IndustryType type, uint32 flags, const IndustrySpec *indspec, const IndustryTileTable *it) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1453 |
{ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1454 |
const Town *t; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1455 |
Industry *i; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1456 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1457 |
if (!CheckIfIndustryTilesAreFree(tile, it, type)) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1458 |
if (_patches.land_generator == LG_TERRAGENESIS && _generating_world && !CheckIfCanLevelIndustryPlatform(tile, 0, it, type)) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1459 |
if (!_check_new_industry_procs[indspec->check_proc](tile)) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1460 |
if (!CheckIfTooCloseToIndustry(tile, type)) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1461 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1462 |
t = CheckMultipleIndustryInTown(tile, type); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1463 |
if (t == NULL) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1464 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1465 |
if (!CheckIfIndustryIsAllowed(tile, type, t)) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1466 |
if (!CheckSuitableIndustryPos(tile)) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1467 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1468 |
i = AllocateIndustry(); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1469 |
if (i == NULL) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1470 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1471 |
if (flags & DC_EXEC) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1472 |
CheckIfCanLevelIndustryPlatform(tile, DC_EXEC, it, type); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1473 |
DoCreateNewIndustry(i, tile, type, it, t, OWNER_NONE); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1474 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1475 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1476 |
return i; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1477 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1478 |
|
1786
a54634efeb98
(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
|
1479 |
/** Build/Fund an industry |
3491
4c8427796c64
(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
|
1480 |
* @param tile tile where industry is built |
1786
a54634efeb98
(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
|
1481 |
* @param p1 industry type @see build_industry.h and @see industry.h |
a54634efeb98
(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
|
1482 |
* @param p2 unused |
a54634efeb98
(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
|
1483 |
*/ |
3491
4c8427796c64
(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
|
1484 |
int32 CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1485 |
{ |
1486 |
int num; |
|
1487 |
const IndustryTileTable * const *itt; |
|
1488 |
const IndustryTileTable *it; |
|
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1489 |
const IndustrySpec *indspec; |
0 | 1490 |
|
1491 |
SET_EXPENSES_TYPE(EXPENSES_OTHER); |
|
1492 |
||
4965
9d4ad0851fde
(svn r6965) -CodeChange : Add a climate bitmask member to IndutrySpec.
belugas
parents:
4942
diff
changeset
|
1493 |
indspec = GetIndustrySpec(p1); |
2639 | 1494 |
|
4965
9d4ad0851fde
(svn r6965) -CodeChange : Add a climate bitmask member to IndutrySpec.
belugas
parents:
4942
diff
changeset
|
1495 |
/* Check if the to-be built/founded industry is available for this climate. */ |
9d4ad0851fde
(svn r6965) -CodeChange : Add a climate bitmask member to IndutrySpec.
belugas
parents:
4942
diff
changeset
|
1496 |
if (!HASBIT(indspec->climate_availability, _opt_ptr->landscape)) return CMD_ERROR; |
0 | 1497 |
|
2638
0c9b00251fce
(svn r3180) Replace some magic numbers by symbolic names
tron
parents:
2637
diff
changeset
|
1498 |
/* If the patch for raw-material industries is not on, you cannot build raw-material industries. |
1800
39966454c434
(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
|
1499 |
* Raw material industries are industries that do not accept cargo (at least for now) |
2638
0c9b00251fce
(svn r3180) Replace some magic numbers by symbolic names
tron
parents:
2637
diff
changeset
|
1500 |
* Exclude the lumber mill (only "raw" industry that can be built) */ |
0c9b00251fce
(svn r3180) Replace some magic numbers by symbolic names
tron
parents:
2637
diff
changeset
|
1501 |
if (!_patches.build_rawmaterial_ind && |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1502 |
indspec->accepts_cargo[0] == CT_INVALID && |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1503 |
indspec->accepts_cargo[1] == CT_INVALID && |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1504 |
indspec->accepts_cargo[2] == CT_INVALID && |
2638
0c9b00251fce
(svn r3180) Replace some magic numbers by symbolic names
tron
parents:
2637
diff
changeset
|
1505 |
p1 != IT_LUMBER_MILL) { |
0c9b00251fce
(svn r3180) Replace some magic numbers by symbolic names
tron
parents:
2637
diff
changeset
|
1506 |
return CMD_ERROR; |
0c9b00251fce
(svn r3180) Replace some magic numbers by symbolic names
tron
parents:
2637
diff
changeset
|
1507 |
} |
0 | 1508 |
|
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1509 |
num = indspec->num_table; |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1510 |
itt = indspec->table; |
0 | 1511 |
|
1512 |
do { |
|
1786
a54634efeb98
(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
|
1513 |
if (--num < 0) return_cmd_error(STR_0239_SITE_UNSUITABLE); |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1514 |
} while (!CheckIfIndustryTilesAreFree(tile, it = itt[num], p1)); |
0 | 1515 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1516 |
if (CreateNewIndustryHelper(tile, p1, flags, indspec, it) == NULL) return CMD_ERROR; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1517 |
|
3689
db67c356f44b
(svn r4614) CodeChange : Cleanup of industry_cmd (Step-4).
belugas
parents:
3669
diff
changeset
|
1518 |
return (_price.build_industry >> 5) * indspec->cost_multiplier; |
0 | 1519 |
} |
1520 |
||
1521 |
||
3538
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
1522 |
Industry *CreateNewIndustry(TileIndex tile, IndustryType type) |
0 | 1523 |
{ |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1524 |
const IndustrySpec *indspec = GetIndustrySpec(type); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1525 |
const IndustryTileTable *it = indspec->table[RandomRange(indspec->num_table)]; |
0 | 1526 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1527 |
return CreateNewIndustryHelper(tile, type, DC_EXEC, indspec, it); |
0 | 1528 |
} |
1529 |
||
110
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
61
diff
changeset
|
1530 |
static const byte _numof_industry_table[4][12] = { |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1531 |
// difficulty settings for number of industries |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1532 |
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, //none |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1533 |
{0, 1, 1, 1, 2, 2, 3, 3, 4, 4, 5}, //low |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1534 |
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, //normal |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1535 |
{0, 2, 3, 4, 6, 7, 8, 9, 10, 10, 10}, //high |
0 | 1536 |
}; |
1537 |
||
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1538 |
static void PlaceInitialIndustry(IndustryType type, int amount) |
0 | 1539 |
{ |
2072
c7961c4a74ac
(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
|
1540 |
int num = _numof_industry_table[_opt.diff.number_industries][amount]; |
c7961c4a74ac
(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
|
1541 |
|
c7961c4a74ac
(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
|
1542 |
if (type == IT_OIL_REFINERY || type == IT_OIL_RIG) { |
c7961c4a74ac
(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
|
1543 |
// These are always placed next to the coastline, so we scale by the perimeter instead. |
c7961c4a74ac
(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
|
1544 |
num = ScaleByMapSize1D(num); |
c7961c4a74ac
(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
|
1545 |
} else { |
c7961c4a74ac
(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
|
1546 |
num = ScaleByMapSize(num); |
c7961c4a74ac
(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
|
1547 |
} |
110
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
61
diff
changeset
|
1548 |
|
2639 | 1549 |
if (_opt.diff.number_industries != 0) { |
2498
befad2fe53d2
(svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants
tron
parents:
2493
diff
changeset
|
1550 |
PlayerID old_player = _current_player; |
266
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
1551 |
_current_player = OWNER_NONE; |
61
cd2827156f2a
(svn r62) - Added "None" as option for number of industries in difficulty settings
orudge
parents:
43
diff
changeset
|
1552 |
assert(num > 0); |
0 | 1553 |
|
1554 |
do { |
|
2639 | 1555 |
uint i; |
1556 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1557 |
IncreaseGeneratingWorldProgress(GWP_INDUSTRY); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1558 |
|
2639 | 1559 |
for (i = 0; i < 2000; i++) { |
1560 |
if (CreateNewIndustry(RandomTile(), type) != NULL) break; |
|
1561 |
} |
|
110
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
61
diff
changeset
|
1562 |
} while (--num); |
266
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
1563 |
|
267 | 1564 |
_current_player = old_player; |
61
cd2827156f2a
(svn r62) - Added "None" as option for number of industries in difficulty settings
orudge
parents:
43
diff
changeset
|
1565 |
} |
0 | 1566 |
} |
1567 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
1568 |
void GenerateIndustries(void) |
0 | 1569 |
{ |
1570 |
const byte *b; |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1571 |
uint i = 0; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1572 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1573 |
/* Find the total amount of industries */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1574 |
b = _industry_create_table[_opt.landscape]; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1575 |
do { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1576 |
int num = _numof_industry_table[_opt.diff.number_industries][b[0]]; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1577 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1578 |
if (b[1] == IT_OIL_REFINERY || b[1] == IT_OIL_RIG) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1579 |
/* These are always placed next to the coastline, so we scale by the perimeter instead. */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1580 |
num = ScaleByMapSize1D(num); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1581 |
} else { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1582 |
num = ScaleByMapSize(num); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1583 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1584 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1585 |
i += num; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1586 |
} while ( (b+=2)[0] != 0); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1587 |
SetGeneratingWorldProgress(GWP_INDUSTRY, i); |
0 | 1588 |
|
1589 |
b = _industry_create_table[_opt.landscape]; |
|
1590 |
do { |
|
1591 |
PlaceInitialIndustry(b[1], b[0]); |
|
1592 |
} while ( (b+=2)[0] != 0); |
|
1593 |
} |
|
1594 |
||
3496
2775485abdf6
(svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G|S]etIndustrype
belugas
parents:
3495
diff
changeset
|
1595 |
/* Change industry production or do closure */ |
0 | 1596 |
static void ExtChangeIndustryProduction(Industry *i) |
1597 |
{ |
|
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1598 |
bool closeit = true; |
0 | 1599 |
int j; |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1600 |
const IndustrySpec *indspec = GetIndustrySpec(i->type); |
0 | 1601 |
|
4924
6e29520a0ba8
(svn r6904) -CodeChange : Cleanup of industry_cmd (Step-5).
belugas
parents:
4815
diff
changeset
|
1602 |
switch (indspec->life_type) { |
3496
2775485abdf6
(svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G|S]etIndustrype
belugas
parents:
3495
diff
changeset
|
1603 |
case INDUSTRYLIFE_NOT_CLOSABLE: |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1604 |
return; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1605 |
|
3496
2775485abdf6
(svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G|S]etIndustrype
belugas
parents:
3495
diff
changeset
|
1606 |
case INDUSTRYLIFE_CLOSABLE: |
4329
9759d5c52010
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4328
diff
changeset
|
1607 |
if ((byte)(_cur_year - i->last_prod_year) < 5 || !CHANCE16(1, 180)) |
0 | 1608 |
closeit = false; |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1609 |
break; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1610 |
|
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1611 |
default: /* INDUSTRY_PRODUCTION */ |
2638
0c9b00251fce
(svn r3180) Replace some magic numbers by symbolic names
tron
parents:
2637
diff
changeset
|
1612 |
for (j = 0; j < 2 && i->produced_cargo[j] != CT_INVALID; j++){ |
1603
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1613 |
uint32 r = Random(); |
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1614 |
int old, new, percent; |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1615 |
int mag; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1616 |
|
1603
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1617 |
new = old = i->production_rate[j]; |
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1618 |
if (CHANCE16I(20, 1024, r)) |
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1619 |
new -= ((RandomRange(50) + 10) * old) >> 8; |
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1620 |
if (CHANCE16I(20 + (i->pct_transported[j] * 20 >> 8), 1024, r >> 16)) |
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1621 |
new += ((RandomRange(50) + 10) * old) >> 8; |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1622 |
|
1603
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1623 |
new = clamp(new, 0, 255); |
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1624 |
if (new == old) { |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1625 |
closeit = false; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1626 |
continue; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1627 |
} |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1628 |
|
1603
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1629 |
percent = new * 100 / old - 100; |
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1630 |
i->production_rate[j] = new; |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1631 |
|
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1632 |
if (new >= indspec->production_rate[j] / 4) |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1633 |
closeit = false; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1634 |
|
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1635 |
mag = abs(percent); |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1636 |
if (mag >= 10) { |
2070
26c657906f25
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2061
diff
changeset
|
1637 |
SetDParam(2, mag); |
1603
e67485272abc
(svn r2107) - Codechange: Cleanup (well, mostly tidyup) ExtChangeIndustryProduction(). These randoms are strange.
pasky
parents:
1586
diff
changeset
|
1638 |
SetDParam(0, _cargoc.names_s[i->produced_cargo[j]]); |
2070
26c657906f25
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2061
diff
changeset
|
1639 |
SetDParam(1, i->index); |
2639 | 1640 |
AddNewsItem( |
1641 |
percent >= 0 ? STR_INDUSTRY_PROD_GOUP : STR_INDUSTRY_PROD_GODOWN, |
|
1642 |
NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, NT_ECONOMY, 0), |
|
1643 |
i->xy + TileDiffXY(1, 1), 0 |
|
1644 |
); |
|
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1645 |
} |
0 | 1646 |
} |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1647 |
break; |
0 | 1648 |
} |
1649 |
||
3496
2775485abdf6
(svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G|S]etIndustrype
belugas
parents:
3495
diff
changeset
|
1650 |
/* If industry will be closed down, show this */ |
0 | 1651 |
if (closeit) { |
1652 |
i->prod_level = 0; |
|
2070
26c657906f25
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2061
diff
changeset
|
1653 |
SetDParam(0, i->index); |
2639 | 1654 |
AddNewsItem( |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1655 |
indspec->closure_text, |
5461
03285c9589f9
(svn r9343) [0.5] -Backport from trunk (r9000, r9001, r9097, r9137):
rubidium
parents:
5319
diff
changeset
|
1656 |
NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, NT_OPENCLOSE, 0), |
2639 | 1657 |
i->xy + TileDiffXY(1, 1), 0 |
1658 |
); |
|
0 | 1659 |
} |
1660 |
} |
|
1661 |
||
1662 |
||
1663 |
static void UpdateIndustryStatistics(Industry *i) |
|
1664 |
{ |
|
1665 |
byte pct; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1666 |
|
2469
1bfbb0dc0b75
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1667 |
if (i->produced_cargo[0] != CT_INVALID) { |
0 | 1668 |
pct = 0; |
1669 |
if (i->last_mo_production[0] != 0) { |
|
4329
9759d5c52010
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4328
diff
changeset
|
1670 |
i->last_prod_year = _cur_year; |
0 | 1671 |
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
|
1672 |
} |
0 | 1673 |
i->pct_transported[0] = pct; |
1674 |
||
1675 |
i->total_production[0] = i->last_mo_production[0]; |
|
1676 |
i->last_mo_production[0] = 0; |
|
1677 |
||
1678 |
i->total_transported[0] = i->last_mo_transported[0]; |
|
1679 |
i->last_mo_transported[0] = 0; |
|
1680 |
} |
|
1681 |
||
2469
1bfbb0dc0b75
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1682 |
if (i->produced_cargo[1] != CT_INVALID) { |
0 | 1683 |
pct = 0; |
1684 |
if (i->last_mo_production[1] != 0) { |
|
4329
9759d5c52010
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4328
diff
changeset
|
1685 |
i->last_prod_year = _cur_year; |
0 | 1686 |
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
|
1687 |
} |
0 | 1688 |
i->pct_transported[1] = pct; |
1689 |
||
1690 |
i->total_production[1] = i->last_mo_production[1]; |
|
1691 |
i->last_mo_production[1] = 0; |
|
1692 |
||
1693 |
i->total_transported[1] = i->last_mo_transported[1]; |
|
1694 |
i->last_mo_transported[1] = 0; |
|
1695 |
} |
|
1696 |
||
1697 |
||
2469
1bfbb0dc0b75
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1698 |
if (i->produced_cargo[0] != CT_INVALID || i->produced_cargo[1] != CT_INVALID) |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
909
diff
changeset
|
1699 |
InvalidateWindow(WC_INDUSTRY_VIEW, i->index); |
0 | 1700 |
|
2639 | 1701 |
if (i->prod_level == 0) { |
0 | 1702 |
DeleteIndustry(i); |
2639 | 1703 |
} else if (_patches.smooth_economy) { |
0 | 1704 |
ExtChangeIndustryProduction(i); |
2639 | 1705 |
} |
0 | 1706 |
} |
1707 |
||
1708 |
static const byte _new_industry_rand[4][32] = { |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1709 |
{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}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1710 |
{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}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1711 |
{21, 21, 21, 24, 22, 22, 22, 22, 23, 23, 16, 16, 16, 4, 4, 19, 19, 19, 13, 13, 20, 20, 20, 11, 11, 11, 17, 17, 17, 10, 10, 10}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1712 |
{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}, |
0 | 1713 |
}; |
1714 |
||
1715 |
static void MaybeNewIndustry(uint32 r) |
|
1716 |
{ |
|
1717 |
int type; |
|
1718 |
int j; |
|
1719 |
Industry *i; |
|
1720 |
||
2140
d708eb80ab8b
(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
|
1721 |
type = _new_industry_rand[_opt.landscape][GB(r, 16, 5)]; |
0 | 1722 |
|
4297
47ce9665b4af
(svn r5934) -Cleanup: forgot some conversions to Year and to Date
rubidium
parents:
4293
diff
changeset
|
1723 |
if (type == IT_OIL_WELL && _cur_year > 1950) return; |
47ce9665b4af
(svn r5934) -Cleanup: forgot some conversions to Year and to Date
rubidium
parents:
4293
diff
changeset
|
1724 |
if (type == IT_OIL_RIG && _cur_year < 1960) return; |
0 | 1725 |
|
1726 |
j = 2000; |
|
2639 | 1727 |
for (;;) { |
2637
8807e6a63f89
(svn r3179) - RandomRange() and RandomTile() instead of home brewed versions
tron
parents:
2630
diff
changeset
|
1728 |
i = CreateNewIndustry(RandomTile(), type); |
2639 | 1729 |
if (i != NULL) break; |
1730 |
if (--j == 0) return; |
|
0 | 1731 |
} |
1732 |
||
4942
f990abfa4438
(svn r6930) -Codechange: Move industry name into IndustrySpec
belugas
parents:
4924
diff
changeset
|
1733 |
SetDParam(0, GetIndustrySpec(type)->name); |
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
1734 |
SetDParam(1, i->town->index); |
2260
3e97367f7cbc
(svn r2780) Remove some more unused strings and make the use of a few strings more explicit
tron
parents:
2187
diff
changeset
|
1735 |
AddNewsItem( |
3581
e7bbb67ffc00
(svn r4467) -Fix: New plantations now cause the correct ".. being planted .." news item (MeusH)
celestar
parents:
3553
diff
changeset
|
1736 |
(type != IT_FOREST && type != IT_FRUIT_PLANTATION && type != IT_RUBBER_PLANTATION && type != IT_COTTON_CANDY) ? |
2260
3e97367f7cbc
(svn r2780) Remove some more unused strings and make the use of a few strings more explicit
tron
parents:
2187
diff
changeset
|
1737 |
STR_482D_NEW_UNDER_CONSTRUCTION : STR_482E_NEW_BEING_PLANTED_NEAR, |
5461
03285c9589f9
(svn r9343) [0.5] -Backport from trunk (r9000, r9001, r9097, r9137):
rubidium
parents:
5319
diff
changeset
|
1738 |
NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, NT_OPENCLOSE,0), i->xy, 0 |
2260
3e97367f7cbc
(svn r2780) Remove some more unused strings and make the use of a few strings more explicit
tron
parents:
2187
diff
changeset
|
1739 |
); |
0 | 1740 |
} |
1741 |
||
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1742 |
static void ChangeIndustryProduction(Industry *i) |
0 | 1743 |
{ |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1744 |
bool only_decrease = false; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1745 |
StringID str = STR_NULL; |
0 | 1746 |
int type = i->type; |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1747 |
const IndustrySpec *indspec = GetIndustrySpec(type); |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1748 |
|
4924
6e29520a0ba8
(svn r6904) -CodeChange : Cleanup of industry_cmd (Step-5).
belugas
parents:
4815
diff
changeset
|
1749 |
switch (indspec->life_type) { |
3496
2775485abdf6
(svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G|S]etIndustrype
belugas
parents:
3495
diff
changeset
|
1750 |
case INDUSTRYLIFE_NOT_CLOSABLE: |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1751 |
return; |
0 | 1752 |
|
3496
2775485abdf6
(svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G|S]etIndustrype
belugas
parents:
3495
diff
changeset
|
1753 |
case INDUSTRYLIFE_PRODUCTION: |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1754 |
/* decrease or increase */ |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1755 |
if (type == IT_OIL_WELL && _opt.landscape == LT_NORMAL) |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1756 |
only_decrease = true; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1757 |
|
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1758 |
if (only_decrease || CHANCE16(1,3)) { |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1759 |
/* If you transport > 60%, 66% chance we increase, else 33% chance we increase */ |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1760 |
if (!only_decrease && (i->pct_transported[0] > 153) != CHANCE16(1,3)) { |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1761 |
/* Increase production */ |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1762 |
if (i->prod_level != 0x80) { |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1763 |
byte b; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1764 |
|
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1765 |
i->prod_level <<= 1; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1766 |
|
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1767 |
b = i->production_rate[0] * 2; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1768 |
if (i->production_rate[0] >= 128) |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1769 |
b = 0xFF; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1770 |
i->production_rate[0] = b; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1771 |
|
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1772 |
b = i->production_rate[1] * 2; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1773 |
if (i->production_rate[1] >= 128) |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1774 |
b = 0xFF; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1775 |
i->production_rate[1] = b; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1776 |
|
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1777 |
str = indspec->production_up_text; |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1778 |
} |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1779 |
} else { |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1780 |
/* Decrease production */ |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1781 |
if (i->prod_level == 4) { |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1782 |
i->prod_level = 0; |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1783 |
str = indspec->closure_text; |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1784 |
} else { |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1785 |
i->prod_level >>= 1; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1786 |
i->production_rate[0] = (i->production_rate[0] + 1) >> 1; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1787 |
i->production_rate[1] = (i->production_rate[1] + 1) >> 1; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1788 |
|
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1789 |
str = indspec->production_down_text; |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1790 |
} |
0 | 1791 |
} |
1792 |
} |
|
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1793 |
break; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1794 |
|
3496
2775485abdf6
(svn r4347) CodeChange : Renamed IndustryType to IndustryLifeType. Cleanup step toward bringing accessors [G|S]etIndustrype
belugas
parents:
3495
diff
changeset
|
1795 |
case INDUSTRYLIFE_CLOSABLE: |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1796 |
/* maybe close */ |
4329
9759d5c52010
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4328
diff
changeset
|
1797 |
if ( (byte)(_cur_year - i->last_prod_year) >= 5 && CHANCE16(1,2)) { |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1798 |
i->prod_level = 0; |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1799 |
str = indspec->closure_text; |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1800 |
} |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1801 |
break; |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1802 |
} |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1803 |
|
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
1804 |
if (str != STR_NULL) { |
2070
26c657906f25
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2061
diff
changeset
|
1805 |
SetDParam(0, i->index); |
5461
03285c9589f9
(svn r9343) [0.5] -Backport from trunk (r9000, r9001, r9097, r9137):
rubidium
parents:
5319
diff
changeset
|
1806 |
AddNewsItem(str, NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, str == indspec->closure_text ? NT_OPENCLOSE : NT_ECONOMY, 0), i->xy + TileDiffXY(1, 1), 0); |
0 | 1807 |
} |
1808 |
} |
|
1809 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
1810 |
void IndustryMonthlyLoop(void) |
0 | 1811 |
{ |
1812 |
Industry *i; |
|
2498
befad2fe53d2
(svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants
tron
parents:
2493
diff
changeset
|
1813 |
PlayerID old_player = _current_player; |
266
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
1814 |
_current_player = OWNER_NONE; |
0 | 1815 |
|
830
8114845804c9
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
817
diff
changeset
|
1816 |
FOR_ALL_INDUSTRIES(i) { |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1817 |
UpdateIndustryStatistics(i); |
0 | 1818 |
} |
1819 |
||
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1820 |
/* 3% chance that we start a new industry */ |
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1821 |
if (CHANCE16(3, 100)) { |
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1822 |
MaybeNewIndustry(Random()); |
5247
c3eece01af11
(svn r7372) - CodeChange: Rename all GetXXXArraySize() functions to GetNumXXX() and add GetMaxXXXIndex() functions. This prepares for the new pool interface.
matthijs
parents:
5216
diff
changeset
|
1823 |
} else if (!_patches.smooth_economy) { |
4356
bc52a48e2590
(svn r6057) -Codechange: made a function GetRandomXXX, that _always_ returns a valid XXX, unless there are none to pick from. Then NULL is returned.
truelight
parents:
4354
diff
changeset
|
1824 |
i = GetRandomIndustry(); |
bc52a48e2590
(svn r6057) -Codechange: made a function GetRandomXXX, that _always_ returns a valid XXX, unless there are none to pick from. Then NULL is returned.
truelight
parents:
4354
diff
changeset
|
1825 |
if (i != NULL) ChangeIndustryProduction(i); |
0 | 1826 |
} |
266
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
1827 |
|
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
1828 |
_current_player = old_player; |
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
1829 |
|
0 | 1830 |
// production-change |
1831 |
_industry_sort_dirty = true; |
|
1832 |
InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0); |
|
1833 |
} |
|
1834 |
||
1835 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
1836 |
void InitializeIndustries(void) |
0 | 1837 |
{ |
4976
a0d7f63c35b5
(svn r6979) Use the pool macros for the Industry pool
tron
parents:
4965
diff
changeset
|
1838 |
CleanPool(&_Industry_pool); |
a0d7f63c35b5
(svn r6979) Use the pool macros for the Industry pool
tron
parents:
4965
diff
changeset
|
1839 |
AddBlockToPool(&_Industry_pool); |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
909
diff
changeset
|
1840 |
|
0 | 1841 |
_total_industries = 0; |
1842 |
_industry_sort_dirty = true; |
|
4587
47bdc67193da
(svn r6437) -Fix: reset the location of the last sound as that location can be outside the map when you are loading another (smaller) map. Thanks to MeusH for noticing.
rubidium
parents:
4583
diff
changeset
|
1843 |
_industry_sound_tile = 0; |
0 | 1844 |
} |
1845 |
||
1846 |
const TileTypeProcs _tile_type_industry_procs = { |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1847 |
DrawTile_Industry, /* draw_tile_proc */ |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1848 |
GetSlopeZ_Industry, /* get_slope_z_proc */ |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1849 |
ClearTile_Industry, /* clear_tile_proc */ |
4434
4175805666a5
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4403
diff
changeset
|
1850 |
GetAcceptedCargo_Industry, /* get_accepted_cargo_proc */ |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1851 |
GetTileDesc_Industry, /* get_tile_desc_proc */ |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1852 |
GetTileTrackStatus_Industry, /* get_tile_track_status_proc */ |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1853 |
ClickTile_Industry, /* click_tile_proc */ |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1854 |
AnimateTile_Industry, /* animate_tile_proc */ |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1855 |
TileLoop_Industry, /* tile_loop_proc */ |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1856 |
ChangeTileOwner_Industry, /* change_tile_owner_proc */ |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1857 |
GetProducedCargo_Industry, /* get_produced_cargo_proc */ |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1858 |
NULL, /* vehicle_enter_tile_proc */ |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1859 |
GetSlopeTileh_Industry, /* get_slope_tileh_proc */ |
0 | 1860 |
}; |
1861 |
||
1881
023a134a4b12
(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
|
1862 |
static const SaveLoad _industry_desc[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1863 |
SLE_CONDVAR(Industry, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1864 |
SLE_CONDVAR(Industry, xy, SLE_UINT32, 6, SL_MAX_VERSION), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1865 |
SLE_VAR(Industry, width, SLE_UINT8), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1866 |
SLE_VAR(Industry, height, SLE_UINT8), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1867 |
SLE_REF(Industry, town, REF_TOWN), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1868 |
SLE_ARR(Industry, produced_cargo, SLE_UINT8, 2), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1869 |
SLE_ARR(Industry, cargo_waiting, SLE_UINT16, 2), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1870 |
SLE_ARR(Industry, production_rate, SLE_UINT8, 2), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1871 |
SLE_ARR(Industry, accepts_cargo, SLE_UINT8, 3), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1872 |
SLE_VAR(Industry, prod_level, SLE_UINT8), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1873 |
SLE_ARR(Industry, last_mo_production, SLE_UINT16, 2), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1874 |
SLE_ARR(Industry, last_mo_transported, SLE_UINT16, 2), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1875 |
SLE_ARR(Industry, pct_transported, SLE_UINT8, 2), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1876 |
SLE_ARR(Industry, total_production, SLE_UINT16, 2), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1877 |
SLE_ARR(Industry, total_transported, SLE_UINT16, 2), |
0 | 1878 |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1879 |
SLE_VAR(Industry, counter, SLE_UINT16), |
0 | 1880 |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1881 |
SLE_VAR(Industry, type, SLE_UINT8), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1882 |
SLE_VAR(Industry, owner, SLE_UINT8), |
4942
f990abfa4438
(svn r6930) -Codechange: Move industry name into IndustrySpec
belugas
parents:
4924
diff
changeset
|
1883 |
SLE_VAR(Industry, random_color, SLE_UINT8), |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1884 |
SLE_CONDVAR(Industry, last_prod_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1885 |
SLE_CONDVAR(Industry, last_prod_year, SLE_INT32, 31, SL_MAX_VERSION), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4330
diff
changeset
|
1886 |
SLE_VAR(Industry, was_cargo_delivered, SLE_UINT8), |
0 | 1887 |
|
1888 |
// reserve extra space in savegame here. (currently 32 bytes) |
|
3222
8bfed4267cba
(svn r3895) - Add proper SLE(G)_CONDNULL macros for the empty space reservation in savegames and update where used
Darkvater
parents:
3173
diff
changeset
|
1889 |
SLE_CONDNULL(32, 2, SL_MAX_VERSION), |
0 | 1890 |
|
1891 |
SLE_END() |
|
1892 |
}; |
|
1893 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
1894 |
static void Save_INDY(void) |
0 | 1895 |
{ |
1896 |
Industry *ind; |
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
909
diff
changeset
|
1897 |
|
0 | 1898 |
// Write the vehicles |
830
8114845804c9
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
817
diff
changeset
|
1899 |
FOR_ALL_INDUSTRIES(ind) { |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1900 |
SlSetArrayIndex(ind->index); |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1901 |
SlObject(ind, _industry_desc); |
0 | 1902 |
} |
1903 |
} |
|
1904 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1059
diff
changeset
|
1905 |
static void Load_INDY(void) |
0 | 1906 |
{ |
1907 |
int index; |
|
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1908 |
|
0 | 1909 |
_total_industries = 0; |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1910 |
|
0 | 1911 |
while ((index = SlIterateArray()) != -1) { |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1912 |
Industry *i; |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
909
diff
changeset
|
1913 |
|
4976
a0d7f63c35b5
(svn r6979) Use the pool macros for the Industry pool
tron
parents:
4965
diff
changeset
|
1914 |
if (!AddBlockIfNeeded(&_Industry_pool, index)) |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1915 |
error("Industries: failed loading savegame: too many industries"); |
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1916 |
|
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1917 |
i = GetIndustry(index); |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
909
diff
changeset
|
1918 |
SlObject(i, _industry_desc); |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
1919 |
|
5298
6d4c150bdd94
(svn r7451) -Fix (7372): GetNum(Towns|Industries) should return the actual number of towns and industries.
rubidium
parents:
5247
diff
changeset
|
1920 |
_total_industries++; |
0 | 1921 |
} |
1922 |
} |
|
1923 |
||
1924 |
const ChunkHandler _industry_chunk_handlers[] = { |
|
1925 |
{ 'INDY', Save_INDY, Load_INDY, CH_ARRAY | CH_LAST}, |
|
1926 |
}; |