author | glx |
Fri, 07 Dec 2007 21:16:38 +0000 | |
changeset 8526 | 3804c50aeb9f |
parent 8485 | 3319dc8510e0 |
child 8545 | 0f083181232e |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
3 |
/** @file industry_cmd.cpp */ |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1881
diff
changeset
|
6 |
#include "openttd.h" |
3144
426b825578f9
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
3094
diff
changeset
|
7 |
#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
|
8 |
#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
|
9 |
#include "industry_map.h" |
3338
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3331
diff
changeset
|
10 |
#include "station_map.h" |
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
497
diff
changeset
|
11 |
#include "table/strings.h" |
7762
03721db0ac1c
(svn r10587) -Codechange: move the string/dparam related stuff from variables.h to strings.h
rubidium
parents:
7758
diff
changeset
|
12 |
#include "strings.h" |
2148
47ba4a1b1c3b
(svn r2658) -Codechange: Use MAKE_TRANSPARENT to display a transparented sprite
celestar
parents:
2140
diff
changeset
|
13 |
#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
|
14 |
#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
|
15 |
#include "tile.h" |
8387
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
16 |
#include "train.h" |
6669
487ac09b95c4
(svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents:
6633
diff
changeset
|
17 |
#include "landscape.h" |
0 | 18 |
#include "viewport.h" |
19 |
#include "command.h" |
|
20 |
#include "industry.h" |
|
21 |
#include "town.h" |
|
22 |
#include "vehicle.h" |
|
23 |
#include "news.h" |
|
24 |
#include "saveload.h" |
|
25 |
#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
|
26 |
#include "sound.h" |
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2150
diff
changeset
|
27 |
#include "variables.h" |
3654
4a3f8056a61c
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
belugas
parents:
3645
diff
changeset
|
28 |
#include "table/industry_land.h" |
4a3f8056a61c
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
belugas
parents:
3645
diff
changeset
|
29 |
#include "table/build_industry.h" |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
30 |
#include "genworld.h" |
4261
2ec8f5a9747b
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
4231
diff
changeset
|
31 |
#include "date.h" |
5056
20369e09627b
(svn r7109) -Codechange: use map accessor IsClearWaterTile
belugas
parents:
4976
diff
changeset
|
32 |
#include "water_map.h" |
6160
126831e48987
(svn r8535) -Feature: Allow lumbermill to cut trees only when they are full grown.
belugas
parents:
6135
diff
changeset
|
33 |
#include "tree_map.h" |
6417
26acff62d001
(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.
peter1138
parents:
6160
diff
changeset
|
34 |
#include "cargotype.h" |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
35 |
#include "newgrf.h" |
7789
bda67a697f68
(svn r10641) -Fix(r10638): Forgotten Son... err...include
belugas
parents:
7788
diff
changeset
|
36 |
#include "newgrf_commons.h" |
7664
81c35390400e
(svn r10442) -Codechange: implement the industry production callback.
rubidium
parents:
7661
diff
changeset
|
37 |
#include "newgrf_industries.h" |
7466
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
38 |
#include "newgrf_industrytiles.h" |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
39 |
#include "newgrf_callbacks.h" |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
40 |
#include "misc/autoptr.hpp" |
8078
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
41 |
#include "autoslope.h" |
8345
6caa3fdb972c
(svn r11399) -Feature(ette): transparency settings can now be saved and thus remembered.
belugas
parents:
8319
diff
changeset
|
42 |
#include "transparency.h" |
8444
9317090e9c8c
(svn r11504) -Fix [FS#1467]: removing docks/ship depots could result in non-canal water where canals should have been build.
rubidium
parents:
8443
diff
changeset
|
43 |
#include "water.h" |
0 | 44 |
|
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
45 |
void ShowIndustryViewWindow(int industry); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
46 |
void BuildOilRig(TileIndex tile); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
47 |
|
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
48 |
static byte _industry_sound_ctr; |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
49 |
static TileIndex _industry_sound_tile; |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
50 |
|
7320
052da893fbd9
(svn r10063) -Codechange: Change VARDEF for extern
belugas
parents:
7315
diff
changeset
|
51 |
int _total_industries; //general counter |
052da893fbd9
(svn r10063) -Codechange: Change VARDEF for extern
belugas
parents:
7315
diff
changeset
|
52 |
uint16 _industry_counts[NUM_INDUSTRYTYPES]; // Number of industries per type ingame |
052da893fbd9
(svn r10063) -Codechange: Change VARDEF for extern
belugas
parents:
7315
diff
changeset
|
53 |
|
052da893fbd9
(svn r10063) -Codechange: Change VARDEF for extern
belugas
parents:
7315
diff
changeset
|
54 |
const Industry **_industry_sort; |
052da893fbd9
(svn r10063) -Codechange: Change VARDEF for extern
belugas
parents:
7315
diff
changeset
|
55 |
bool _industry_sort_dirty; |
052da893fbd9
(svn r10063) -Codechange: Change VARDEF for extern
belugas
parents:
7315
diff
changeset
|
56 |
|
7239
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
57 |
IndustrySpec _industry_specs[NUM_INDUSTRYTYPES]; |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
58 |
IndustryTileSpec _industry_tile_specs[NUM_INDUSTRYTILES]; |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
59 |
|
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
60 |
/** This function initialize the spec arrays of both |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
61 |
* industry and industry tiles. |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
62 |
* It adjusts the enabling of the industry too, based on climate availability. |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
63 |
* This will allow for clearer testings */ |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
64 |
void ResetIndustries() |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
65 |
{ |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
66 |
memset(&_industry_specs, 0, sizeof(_industry_specs)); |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
67 |
memcpy(&_industry_specs, &_origin_industry_specs, sizeof(_origin_industry_specs)); |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
68 |
|
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
69 |
/* once performed, enable only the current climate industries */ |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
70 |
for (IndustryType i = 0; i < NUM_INDUSTRYTYPES; i++) { |
8150
3b6a36860a47
(svn r11185) -Codechange: prepare some more code for the introduction of NewIndustries. Patch by Belugas.
rubidium
parents:
8146
diff
changeset
|
71 |
_industry_specs[i].enabled = i < NEW_INDUSTRYOFFSET && |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
72 |
HasBit(_origin_industry_specs[i].climate_availability, _opt.landscape); |
7239
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
73 |
} |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
74 |
|
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
75 |
memset(&_industry_tile_specs, 0, sizeof(_industry_tile_specs)); |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
76 |
memcpy(&_industry_tile_specs, &_origin_industry_tile_specs, sizeof(_origin_industry_tile_specs)); |
8162
8e15b94334b5
(svn r11197) -Fix: It is not useful to reset the override of an entity every time a new grf file is been submitted.
belugas
parents:
8159
diff
changeset
|
77 |
|
8e15b94334b5
(svn r11197) -Fix: It is not useful to reset the override of an entity every time a new grf file is been submitted.
belugas
parents:
8159
diff
changeset
|
78 |
/* Reset any overrides that have been set. */ |
8e15b94334b5
(svn r11197) -Fix: It is not useful to reset the override of an entity every time a new grf file is been submitted.
belugas
parents:
8159
diff
changeset
|
79 |
_industile_mngr.ResetOverride(); |
8e15b94334b5
(svn r11197) -Fix: It is not useful to reset the override of an entity every time a new grf file is been submitted.
belugas
parents:
8159
diff
changeset
|
80 |
_industry_mngr.ResetOverride(); |
7239
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
81 |
} |
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
82 |
|
7757
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
83 |
void ResetIndustryCreationProbility(IndustryType type) |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
84 |
{ |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
85 |
assert(type < INVALID_INDUSTRYTYPE); |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
86 |
_industry_specs[type].appear_creation[_opt.landscape] = 0; |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
87 |
} |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
88 |
|
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
89 |
DEFINE_OLD_POOL_GENERIC(Industry, Industry) |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
90 |
|
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
|
91 |
/** |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
92 |
* 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
|
93 |
* 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
|
94 |
* 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
|
95 |
* @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
|
96 |
* @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
|
97 |
* @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
|
98 |
**/ |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
99 |
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
|
100 |
{ |
e95d6e5f66ae
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3496
diff
changeset
|
101 |
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
|
102 |
|
7135
8078f2b614e4
(svn r9870) -Codechange: Silence two compiler warnings and give proper type to the "type" member of industry struct
belugas
parents:
7132
diff
changeset
|
103 |
const Industry *ind = GetIndustryByTile(tile); |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
104 |
return ind->IsValid() ? ind->type : (IndustryType)IT_INVALID; |
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
|
105 |
} |
0 | 106 |
|
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
107 |
/** |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
108 |
* Accessor for array _industry_specs. |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
109 |
* This will ensure at once : proper access and |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
110 |
* not allowing modifications of it. |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
111 |
* @param thistype of industry (which is the index in _industry_specs) |
6989
43b359b4cb86
(svn r9676) -Codechange: introduce NUM_INDUSTRYTYPES instead of IT_END.
belugas
parents:
6987
diff
changeset
|
112 |
* @pre thistype < NUM_INDUSTRYTYPES |
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
113 |
* @return a pointer to the corresponding industry spec |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
114 |
**/ |
3689
db67c356f44b
(svn r4614) CodeChange : Cleanup of industry_cmd (Step-4).
belugas
parents:
3669
diff
changeset
|
115 |
const IndustrySpec *GetIndustrySpec(IndustryType thistype) |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
116 |
{ |
6989
43b359b4cb86
(svn r9676) -Codechange: introduce NUM_INDUSTRYTYPES instead of IT_END.
belugas
parents:
6987
diff
changeset
|
117 |
assert(thistype < NUM_INDUSTRYTYPES); |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
118 |
return &_industry_specs[thistype]; |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
119 |
} |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
120 |
|
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
121 |
/** |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
122 |
* Accessor for array _industry_tile_specs. |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
123 |
* This will ensure at once : proper access and |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
124 |
* not allowing modifications of it. |
7784
efb98124ce51
(svn r10635) -Codechange: Correct some typos and code beautifying (a little bit)
belugas
parents:
7762
diff
changeset
|
125 |
* @param gfx of industrytile (which is the index in _industry_tile_specs) |
7245
f868248ecf83
(svn r9984) -Codechange: Remove an obsolete structure and a now meaningless enum, in favor of the "real thing"
belugas
parents:
7244
diff
changeset
|
126 |
* @pre gfx < INVALID_INDUSTRYTILE |
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
127 |
* @return a pointer to the corresponding industrytile spec |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
128 |
**/ |
7958
86754174b58f
(svn r10963) -Revert(10700): Although the idea was good, it was more prone of errors than usefull.
belugas
parents:
7957
diff
changeset
|
129 |
const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx) |
6418
a80dba2d8243
(svn r8827) -Codechange: Cleanup of industry_cmd (Step-6). Implementation of IndustryTileSPec, the alter ego of IndustrySpec.
belugas
parents:
6417
diff
changeset
|
130 |
{ |
7245
f868248ecf83
(svn r9984) -Codechange: Remove an obsolete structure and a now meaningless enum, in favor of the "real thing"
belugas
parents:
7244
diff
changeset
|
131 |
assert(gfx < INVALID_INDUSTRYTILE); |
7958
86754174b58f
(svn r10963) -Revert(10700): Although the idea was good, it was more prone of errors than usefull.
belugas
parents:
7957
diff
changeset
|
132 |
return &_industry_tile_specs[gfx]; |
6418
a80dba2d8243
(svn r8827) -Codechange: Cleanup of industry_cmd (Step-6). Implementation of IndustryTileSPec, the alter ego of IndustrySpec.
belugas
parents:
6417
diff
changeset
|
133 |
} |
a80dba2d8243
(svn r8827) -Codechange: Cleanup of industry_cmd (Step-6). Implementation of IndustryTileSPec, the alter ego of IndustrySpec.
belugas
parents:
6417
diff
changeset
|
134 |
|
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
135 |
Industry::~Industry() |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
136 |
{ |
7916
8bc57ab02de6
(svn r10813) -Fix (r10799): some destructors were performing too much during the pool cleanups, which could cause crashes as already removed pool items could then be dereferenced by other destructors.
rubidium
parents:
7897
diff
changeset
|
137 |
if (CleaningPool()) return; |
8bc57ab02de6
(svn r10813) -Fix (r10799): some destructors were performing too much during the pool cleanups, which could cause crashes as already removed pool items could then be dereferenced by other destructors.
rubidium
parents:
7897
diff
changeset
|
138 |
|
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
139 |
/* Industry can also be destroyed when not fully initialized. |
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
140 |
* This means that we do not have to clear tiles either. */ |
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
141 |
if (this->width == 0) { |
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
142 |
this->xy = 0; |
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
143 |
return; |
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
144 |
} |
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
145 |
|
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
146 |
BEGIN_TILE_LOOP(tile_cur, this->width, this->height, this->xy); |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
147 |
if (IsTileType(tile_cur, MP_INDUSTRY)) { |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
148 |
if (GetIndustryIndex(tile_cur) == this->index) { |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
149 |
DoClearSquare(tile_cur); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
150 |
} |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
151 |
} 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
|
152 |
DeleteOilRig(tile_cur); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
153 |
} |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
154 |
END_TILE_LOOP(tile_cur, this->width, this->height, this->xy); |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
155 |
|
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
156 |
if (GetIndustrySpec(this->type)->behaviour & INDUSTRYBEH_PLANT_FIELDS) { |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
157 |
/* Remove the farmland and convert it to regular tiles over time. */ |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
158 |
BEGIN_TILE_LOOP(tile_cur, 42, 42, this->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
|
159 |
tile_cur = TILE_MASK(tile_cur); |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
160 |
if (IsTileType(tile_cur, MP_CLEAR) && IsClearGround(tile_cur, CLEAR_FIELDS) && |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
161 |
GetIndustryIndexOfField(tile_cur) == this->index) { |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
162 |
SetIndustryIndexOfField(tile_cur, INVALID_INDUSTRY); |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
163 |
} |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
164 |
} END_TILE_LOOP(tile_cur, 42, 42, this->xy - TileDiff(21, 21)) |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
165 |
} |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
166 |
|
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
167 |
_industry_sort_dirty = true; |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
168 |
DecIndustryTypeCount(this->type); |
7320
052da893fbd9
(svn r10063) -Codechange: Change VARDEF for extern
belugas
parents:
7315
diff
changeset
|
169 |
|
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
170 |
DeleteSubsidyWithIndustry(this->index); |
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
171 |
DeleteWindowById(WC_INDUSTRY_VIEW, this->index); |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
172 |
InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0); |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
173 |
this->xy = 0; |
4403
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
174 |
} |
851d2a602806
(svn r6156) -Codechange: DeleteIndustry removes an industry from the pool
truelight
parents:
4357
diff
changeset
|
175 |
|
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
176 |
static void IndustryDrawSugarMine(const TileInfo *ti) |
0 | 177 |
{ |
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
178 |
const DrawIndustryAnimationStruct *d; |
0 | 179 |
|
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
180 |
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
|
181 |
|
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
182 |
d = &_draw_industry_spec1[GetIndustryAnimationState(ti->tile)]; |
0 | 183 |
|
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
184 |
AddChildSpriteScreen(SPR_IT_SUGAR_MINE_SIEVE + d->image_1, PAL_NONE, d->x, 0); |
0 | 185 |
|
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
186 |
if (d->image_2 != 0) { |
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
187 |
AddChildSpriteScreen(SPR_IT_SUGAR_MINE_CLOUDS + d->image_2 - 1, PAL_NONE, 8, 41); |
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
188 |
} |
0 | 189 |
|
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
190 |
if (d->image_3 != 0) { |
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
191 |
AddChildSpriteScreen(SPR_IT_SUGAR_MINE_PILE + d->image_3 - 1, PAL_NONE, |
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
192 |
_drawtile_proc1[d->image_3 - 1].x, _drawtile_proc1[d->image_3 - 1].y); |
2639 | 193 |
} |
0 | 194 |
} |
195 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
196 |
static void IndustryDrawToffeeQuarry(const TileInfo *ti) |
0 | 197 |
{ |
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
198 |
uint8 x = 0; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
199 |
|
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
200 |
if (IsIndustryCompleted(ti->tile)) { |
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
201 |
x = _industry_anim_offs_toffee[GetIndustryAnimationState(ti->tile)]; |
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
202 |
if (x == 0xFF) |
0 | 203 |
x = 0; |
204 |
} |
|
205 |
||
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
206 |
AddChildSpriteScreen(SPR_IT_TOFFEE_QUARRY_SHOVEL, PAL_NONE, 22 - x, 24 + x); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
207 |
AddChildSpriteScreen(SPR_IT_TOFFEE_QUARRY_TOFFEE, PAL_NONE, 6, 14); |
0 | 208 |
} |
209 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
210 |
static void IndustryDrawBubbleGenerator( const TileInfo *ti) |
0 | 211 |
{ |
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
212 |
if (IsIndustryCompleted(ti->tile)) { |
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
213 |
AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_BUBBLE, PAL_NONE, 5, _industry_anim_offs_bubbles[GetIndustryAnimationState(ti->tile)]); |
2639 | 214 |
} else { |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
215 |
AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_SPRING, PAL_NONE, 3, 67); |
0 | 216 |
} |
217 |
} |
|
218 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
219 |
static void IndustryDrawToyFactory(const TileInfo *ti) |
0 | 220 |
{ |
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
221 |
const DrawIndustryAnimationStruct *d; |
0 | 222 |
|
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
223 |
d = &_industry_anim_offs_toys[GetIndustryAnimationState(ti->tile)]; |
0 | 224 |
|
225 |
if (d->image_1 != 0xFF) { |
|
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
226 |
AddChildSpriteScreen(SPR_IT_TOY_FACTORY_CLAY, PAL_NONE, d->x, 96 + d->image_1); |
0 | 227 |
} |
228 |
||
229 |
if (d->image_2 != 0xFF) { |
|
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
230 |
AddChildSpriteScreen(SPR_IT_TOY_FACTORY_ROBOT, PAL_NONE, 16 - d->image_2 * 2, 100 + d->image_2); |
0 | 231 |
} |
232 |
||
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
233 |
AddChildSpriteScreen(SPR_IT_TOY_FACTORY_STAMP, PAL_NONE, 7, d->image_3); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
234 |
AddChildSpriteScreen(SPR_IT_TOY_FACTORY_STAMP_HOLDER, PAL_NONE, 0, 42); |
0 | 235 |
} |
236 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
237 |
static void IndustryDrawCoalPlantSparks(const TileInfo *ti) |
0 | 238 |
{ |
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
239 |
if (IsIndustryCompleted(ti->tile)) { |
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
240 |
uint8 image = GetIndustryAnimationState(ti->tile); |
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
241 |
|
0 | 242 |
if (image != 0 && image < 7) { |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
243 |
AddChildSpriteScreen(image + SPR_IT_POWER_PLANT_TRANSFORMERS, |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
244 |
PAL_NONE, |
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
245 |
_coal_plant_sparks[image - 1].x, |
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
246 |
_coal_plant_sparks[image - 1].y |
0 | 247 |
); |
248 |
} |
|
249 |
} |
|
250 |
} |
|
251 |
||
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
|
252 |
typedef void IndustryDrawTileProc(const TileInfo *ti); |
0 | 253 |
static IndustryDrawTileProc * const _industry_draw_tile_procs[5] = { |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
254 |
IndustryDrawSugarMine, |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
255 |
IndustryDrawToffeeQuarry, |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
256 |
IndustryDrawBubbleGenerator, |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
257 |
IndustryDrawToyFactory, |
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
258 |
IndustryDrawCoalPlantSparks, |
0 | 259 |
}; |
260 |
||
261 |
static void DrawTile_Industry(TileInfo *ti) |
|
262 |
{ |
|
7466
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
263 |
IndustryGfx gfx = GetIndustryGfx(ti->tile); |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
264 |
Industry *ind = GetIndustryByTile(ti->tile); |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
265 |
const IndustryTileSpec *indts = GetIndustryTileSpec(gfx); |
3654
4a3f8056a61c
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
belugas
parents:
3645
diff
changeset
|
266 |
const DrawBuildingsTileStruct *dits; |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
267 |
SpriteID image; |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
268 |
SpriteID pal; |
0 | 269 |
|
7466
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
270 |
/* Retrieve pointer to the draw industry tile struct */ |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
271 |
if (gfx >= NEW_INDUSTRYTILEOFFSET) { |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
272 |
/* Draw the tile using the specialized method of newgrf industrytile. |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
273 |
* DrawNewIndustry will return false if ever the resolver could not |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
274 |
* find any sprite to display. So in this case, we will jump on the |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
275 |
* substitute gfx instead. */ |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
276 |
if (indts->grf_prop.spritegroup != NULL && DrawNewIndustryTile(ti, ind, gfx, indts)) { |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
277 |
return; |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
278 |
} else { |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
279 |
/* No sprite group (or no valid one) found, meaning no graphics associated. |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
280 |
* Use the substitute one instead */ |
7957
62dc8719052a
(svn r10962) -Codechange: protect yourself against an illicit substitution
belugas
parents:
7941
diff
changeset
|
281 |
if (indts->grf_prop.subst_id != INVALID_INDUSTRYTILE) { |
62dc8719052a
(svn r10962) -Codechange: protect yourself against an illicit substitution
belugas
parents:
7941
diff
changeset
|
282 |
gfx = indts->grf_prop.subst_id; |
62dc8719052a
(svn r10962) -Codechange: protect yourself against an illicit substitution
belugas
parents:
7941
diff
changeset
|
283 |
/* And point the industrytile spec accordingly */ |
62dc8719052a
(svn r10962) -Codechange: protect yourself against an illicit substitution
belugas
parents:
7941
diff
changeset
|
284 |
indts = GetIndustryTileSpec(gfx); |
62dc8719052a
(svn r10962) -Codechange: protect yourself against an illicit substitution
belugas
parents:
7941
diff
changeset
|
285 |
} |
7466
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
286 |
} |
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
287 |
} |
0 | 288 |
|
7466
01be88d1c0a6
(svn r10226) -Codechange: Add support for newindustry tiles drawing.
belugas
parents:
7446
diff
changeset
|
289 |
dits = &_industry_draw_tile_data[gfx << 2 | (indts->anim_state ? |
7787
6e0b6ea38850
(svn r10639) -Codechange: Give meaninfull name to a magic number
belugas
parents:
7786
diff
changeset
|
290 |
GetIndustryAnimationState(ti->tile) & INDUSTRY_COMPLETED : |
5687
a6f0e780d714
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5686
diff
changeset
|
291 |
GetIndustryConstructionStage(ti->tile))]; |
0 | 292 |
|
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
293 |
image = dits->ground.sprite; |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
294 |
if (HasBit(image, PALETTE_MODIFIER_COLOR) && dits->ground.pal == PAL_NONE) { |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
295 |
pal = GENERAL_SPRITE_COLOR(ind->random_color); |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
296 |
} else { |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
297 |
pal = dits->ground.pal; |
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
298 |
} |
0 | 299 |
|
7831
5dded9b03500
(svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents:
7830
diff
changeset
|
300 |
/* DrawFoundation() modifes ti->z and ti->tileh */ |
5dded9b03500
(svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents:
7830
diff
changeset
|
301 |
if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, FOUNDATION_LEVELED); |
0 | 302 |
|
7531
fa6a933b71d2
(svn r10299) -Codechange [FS#931]: industry foundations should be drawn as all other foundations, i.e. with DrawFoundation, instead of writing the same functionality itself.
rubidium
parents:
7522
diff
changeset
|
303 |
DrawGroundSprite(image, pal); |
fa6a933b71d2
(svn r10299) -Codechange [FS#931]: industry foundations should be drawn as all other foundations, i.e. with DrawFoundation, instead of writing the same functionality itself.
rubidium
parents:
7522
diff
changeset
|
304 |
|
0 | 305 |
/* Add industry on top of the ground? */ |
5919
2b58160d667d
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5838
diff
changeset
|
306 |
image = dits->building.sprite; |
2639 | 307 |
if (image != 0) { |
7829
88883899c9e6
(svn r10696) -Codechange: remove duplication of the "make sprite transparent" code.
rubidium
parents:
7815
diff
changeset
|
308 |
AddSortableSpriteToDraw(image, |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
309 |
(HasBit(image, PALETTE_MODIFIER_COLOR) && dits->building.pal == PAL_NONE) ? GENERAL_SPRITE_COLOR(ind->random_color) : dits->building.pal, |
2653
4173d9a0a27e
(svn r3195) Use bitfields instead of explicit shifting/masking
tron
parents:
2639
diff
changeset
|
310 |
ti->x + dits->subtile_x, |
4173d9a0a27e
(svn r3195) Use bitfields instead of explicit shifting/masking
tron
parents:
2639
diff
changeset
|
311 |
ti->y + dits->subtile_y, |
8073
42007d9c81bb
(svn r11102) -Codechange: remove some pointless addition+substractions. Patch by frosch.
rubidium
parents:
8027
diff
changeset
|
312 |
dits->width, |
42007d9c81bb
(svn r11102) -Codechange: remove some pointless addition+substractions. Patch by frosch.
rubidium
parents:
8027
diff
changeset
|
313 |
dits->height, |
0 | 314 |
dits->dz, |
7831
5dded9b03500
(svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents:
7830
diff
changeset
|
315 |
ti->z, |
8345
6caa3fdb972c
(svn r11399) -Feature(ette): transparency settings can now be saved and thus remembered.
belugas
parents:
8319
diff
changeset
|
316 |
IsTransparencySet(TO_INDUSTRIES)); |
0 | 317 |
|
8345
6caa3fdb972c
(svn r11399) -Feature(ette): transparency settings can now be saved and thus remembered.
belugas
parents:
8319
diff
changeset
|
318 |
if (IsTransparencySet(TO_INDUSTRIES)) return; |
0 | 319 |
} |
320 |
||
2639 | 321 |
{ |
3654
4a3f8056a61c
(svn r4568) CodeChange : Bring definitions and uses of DrawTypesStructures toguether.
belugas
parents:
3645
diff
changeset
|
322 |
int proc = dits->draw_proc - 1; |
2639 | 323 |
if (proc >= 0) _industry_draw_tile_procs[proc](ti); |
0 | 324 |
} |
325 |
} |
|
326 |
||
4231
dea6a63dd058
(svn r5794) Pass the TileIndex plus x and y coordinates into GetSlopeZ_* instead of a TileInfo
tron
parents:
4077
diff
changeset
|
327 |
static uint GetSlopeZ_Industry(TileIndex tile, uint x, uint y) |
2537 | 328 |
{ |
4231
dea6a63dd058
(svn r5794) Pass the TileIndex plus x and y coordinates into GetSlopeZ_* instead of a TileInfo
tron
parents:
4077
diff
changeset
|
329 |
return GetTileMaxZ(tile); |
0 | 330 |
} |
331 |
||
7831
5dded9b03500
(svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents:
7830
diff
changeset
|
332 |
static Foundation GetFoundation_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
|
333 |
{ |
7831
5dded9b03500
(svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents:
7830
diff
changeset
|
334 |
return FlatteningFoundation(tileh); |
39 | 335 |
} |
336 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
337 |
static void GetAcceptedCargo_Industry(TileIndex tile, AcceptedCargo ac) |
0 | 338 |
{ |
7695
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
339 |
IndustryGfx gfx = GetIndustryGfx(tile); |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
340 |
const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx); |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
341 |
|
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
342 |
/* When we have to use a callback, we put our data in the next two variables */ |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
343 |
CargoID raw_accepts_cargo[lengthof(itspec->accepts_cargo)]; |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
344 |
uint8 raw_acceptance[lengthof(itspec->acceptance)]; |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
345 |
|
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
346 |
/* And then these will always point to a same sized array with the required data */ |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
347 |
const CargoID *accepts_cargo = itspec->accepts_cargo; |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
348 |
const uint8 *acceptance = itspec->acceptance; |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
349 |
|
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
350 |
if (HasBit(itspec->callback_flags, CBM_INDT_ACCEPT_CARGO)) { |
7695
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
351 |
uint16 res = GetIndustryTileCallback(CBID_INDTILE_ACCEPT_CARGO, 0, 0, gfx, GetIndustryByTile(tile), tile); |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
352 |
if (res != CALLBACK_FAILED) { |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
353 |
accepts_cargo = raw_accepts_cargo; |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
354 |
for (uint i = 0; i < lengthof(itspec->accepts_cargo); i++) raw_accepts_cargo[i] = GetCargoTranslation(GB(res, i * 5, 5), itspec->grf_prop.grffile); |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
355 |
} |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
356 |
} |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
357 |
|
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
358 |
if (HasBit(itspec->callback_flags, CBM_INDT_CARGO_ACCEPTANCE)) { |
7695
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
359 |
uint16 res = GetIndustryTileCallback(CBID_INDTILE_CARGO_ACCEPTANCE, 0, 0, gfx, GetIndustryByTile(tile), tile); |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
360 |
if (res != CALLBACK_FAILED) { |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
361 |
acceptance = raw_acceptance; |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
362 |
for (uint i = 0; i < lengthof(itspec->accepts_cargo); i++) raw_acceptance[i] = GB(res, i * 4, 4); |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
363 |
} |
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
364 |
} |
0 | 365 |
|
7232
2476045c6aed
(svn r9969) -Codechange: Cleanup of industries (Step-14). Remove hardcoded-run-time tile acceptance and put in corresponding tile
belugas
parents:
7179
diff
changeset
|
366 |
for (byte i = 0; i < lengthof(itspec->accepts_cargo); i++) { |
7695
b15538ba7152
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7682
diff
changeset
|
367 |
CargoID a = accepts_cargo[i]; |
8151
b4a7b7edcb42
(svn r11186) -Fix: only fill the accepted cargo fields once, not multiple times.
rubidium
parents:
8150
diff
changeset
|
368 |
/* Only set the value once. */ |
b4a7b7edcb42
(svn r11186) -Fix: only fill the accepted cargo fields once, not multiple times.
rubidium
parents:
8150
diff
changeset
|
369 |
if (a != CT_INVALID && ac[a] == 0) ac[a] = acceptance[i]; |
7232
2476045c6aed
(svn r9969) -Codechange: Cleanup of industries (Step-14). Remove hardcoded-run-time tile acceptance and put in corresponding tile
belugas
parents:
7179
diff
changeset
|
370 |
} |
0 | 371 |
} |
372 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
373 |
static void GetTileDesc_Industry(TileIndex tile, TileDesc *td) |
0 | 374 |
{ |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
375 |
const Industry *i = GetIndustryByTile(tile); |
0 | 376 |
|
377 |
td->owner = i->owner; |
|
4942
f990abfa4438
(svn r6930) -Codechange: Move industry name into IndustrySpec
belugas
parents:
4924
diff
changeset
|
378 |
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
|
379 |
if (!IsIndustryCompleted(tile)) { |
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
380 |
SetDParamX(td->dparam, 0, td->str); |
0 | 381 |
td->str = STR_2058_UNDER_CONSTRUCTION; |
382 |
} |
|
383 |
} |
|
384 |
||
7439
0c0e2945c890
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
7406
diff
changeset
|
385 |
static CommandCost ClearTile_Industry(TileIndex tile, byte flags) |
0 | 386 |
{ |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
387 |
Industry *i = GetIndustryByTile(tile); |
6886
742e1d75f442
(svn r9520) -Codechange: Add the notion of Industry behaviour. It means what an industry can do (plant fields, cut trees, do not change production), what can be done to it (disasters like mine subsidence, jet/chopper attack), when it can be built etc...
belugas
parents:
6683
diff
changeset
|
388 |
const IndustrySpec *indspec = GetIndustrySpec(i->type); |
0 | 389 |
|
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
|
390 |
/* 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
|
391 |
* 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
|
392 |
* 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
|
393 |
* (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
|
394 |
*/ |
149
5f7d4b21df01
(svn r150) -Fix: [1010833] Turning on the magic bulldozer removes oil rigs
darkvater
parents:
131
diff
changeset
|
395 |
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
|
396 |
!_cheats.magic_bulldozer.value) || |
8133
597f682ff48d
(svn r11168) -Fix [FS#1256]: assert on terraforming of industries. Patch by frosch.
rubidium
parents:
8125
diff
changeset
|
397 |
((flags & DC_AUTO) != 0) || |
6886
742e1d75f442
(svn r9520) -Codechange: Add the notion of Industry behaviour. It means what an industry can do (plant fields, cut trees, do not change production), what can be done to it (disasters like mine subsidence, jet/chopper attack), when it can be built etc...
belugas
parents:
6683
diff
changeset
|
398 |
(_current_player == OWNER_WATER && (indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER))) { |
742e1d75f442
(svn r9520) -Codechange: Add the notion of Industry behaviour. It means what an industry can do (plant fields, cut trees, do not change production), what can be done to it (disasters like mine subsidence, jet/chopper attack), when it can be built etc...
belugas
parents:
6683
diff
changeset
|
399 |
SetDParam(0, indspec->name); |
0 | 400 |
return_cmd_error(STR_4800_IN_THE_WAY); |
401 |
} |
|
402 |
||
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
403 |
if (flags & DC_EXEC) delete i; |
8474
358b35762f02
(svn r11534) -Feature(newgrf): Implement property 23h for Industries.
belugas
parents:
8472
diff
changeset
|
404 |
return CommandCost(indspec->GetRemovalCost()); |
0 | 405 |
} |
406 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
407 |
static void TransportIndustryGoods(TileIndex tile) |
0 | 408 |
{ |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
409 |
Industry *i = GetIndustryByTile(tile); |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
410 |
const IndustrySpec *indspec = GetIndustrySpec(i->type); |
8295
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
411 |
bool moved_cargo = false; |
0 | 412 |
|
8295
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
413 |
for (uint j = 0; j < lengthof(i->produced_cargo_waiting); j++) { |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
414 |
uint cw = min(i->produced_cargo_waiting[j], 255); |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
415 |
if (cw > indspec->minimal_cargo && i->produced_cargo[j] != CT_INVALID) { |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
416 |
i->produced_cargo_waiting[j] -= cw; |
3331 | 417 |
|
8295
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
418 |
/* fluctuating economy? */ |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
419 |
if (_economy.fluct <= 0) cw = (cw + 1) / 2; |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
420 |
|
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
421 |
i->this_month_production[j] += cw; |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
422 |
|
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
423 |
uint am = MoveGoodsToStation(i->xy, i->width, i->height, i->produced_cargo[j], cw); |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
424 |
i->this_month_transported[j] += am; |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
425 |
|
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
426 |
moved_cargo |= (am != 0); |
0 | 427 |
} |
428 |
} |
|
429 |
||
8295
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
430 |
if (moved_cargo && !StartStopIndustryTileAnimation(i, IAT_INDUSTRY_DISTRIBUTES_CARGO)) { |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
431 |
uint newgfx = GetIndustryTileSpec(GetIndustryGfx(tile))->anim_production; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
432 |
|
8295
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
433 |
if (newgfx != INDUSTRYTILE_NOANIM) { |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
434 |
ResetIndustryConstructionStage(tile); |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
435 |
SetIndustryCompleted(tile, true); |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
436 |
SetIndustryGfx(tile, newgfx); |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
437 |
MarkTileDirtyByTile(tile); |
8ab54ba3ba7d
(svn r11349) -Fix [FS#1372]: crash when moving "invalid" cargo to a station.
rubidium
parents:
8256
diff
changeset
|
438 |
} |
0 | 439 |
} |
440 |
} |
|
441 |
||
442 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
443 |
static void AnimateTile_Industry(TileIndex tile) |
0 | 444 |
{ |
3331 | 445 |
byte m; |
7725
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
446 |
IndustryGfx gfx = GetIndustryGfx(tile); |
0 | 447 |
|
7725
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
448 |
if (GetIndustryTileSpec(gfx)->animation_info != 0xFFFF) { |
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
449 |
AnimateNewIndustryTile(tile); |
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
450 |
return; |
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
451 |
} |
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
452 |
|
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
453 |
switch (gfx) { |
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
|
454 |
case GFX_SUGAR_MINE_SIEVE: |
0 | 455 |
if ((_tick_counter & 1) == 0) { |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
456 |
m = GetIndustryAnimationState(tile) + 1; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
457 |
|
2952 | 458 |
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
|
459 |
case 2: SndPlayTileFx(SND_2D_RIP_2, tile); break; |
541 | 460 |
case 6: SndPlayTileFx(SND_29_RIP, tile); break; |
0 | 461 |
} |
462 |
||
463 |
if (m >= 96) { |
|
464 |
m = 0; |
|
465 |
DeleteAnimatedTile(tile); |
|
466 |
} |
|
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
467 |
SetIndustryAnimationState(tile, m); |
0 | 468 |
|
469 |
MarkTileDirtyByTile(tile); |
|
470 |
} |
|
471 |
break; |
|
472 |
||
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
|
473 |
case GFX_TOFFEE_QUARY: |
0 | 474 |
if ((_tick_counter & 3) == 0) { |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
475 |
m = GetIndustryAnimationState(tile); |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
476 |
|
7015
af363e4290ab
(svn r9705) -Codechange: Merge some data arrays together, making a bit more logical units.
belugas
parents:
6989
diff
changeset
|
477 |
if (_industry_anim_offs_toffee[m] == 0xFF) { |
541 | 478 |
SndPlayTileFx(SND_30_CARTOON_SOUND, tile); |
0 | 479 |
} |
480 |
||
481 |
if (++m >= 70) { |
|
482 |
m = 0; |
|
483 |
DeleteAnimatedTile(tile); |
|
484 |
} |
|
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
485 |
SetIndustryAnimationState(tile, m); |
0 | 486 |
|
487 |
MarkTileDirtyByTile(tile); |
|
488 |
} |
|
489 |
break; |
|
490 |
||
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
|
491 |
case GFX_BUBBLE_CATCHER: |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
492 |
if ((_tick_counter & 1) == 0) { |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
493 |
m = GetIndustryAnimationState(tile); |
0 | 494 |
|
495 |
if (++m >= 40) { |
|
496 |
m = 0; |
|
497 |
DeleteAnimatedTile(tile); |
|
498 |
} |
|
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
499 |
SetIndustryAnimationState(tile, m); |
0 | 500 |
|
501 |
MarkTileDirtyByTile(tile); |
|
502 |
} |
|
503 |
break; |
|
504 |
||
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
505 |
/* 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
|
506 |
case GFX_POWERPLANT_SPARKS: |
0 | 507 |
if ((_tick_counter & 3) == 0) { |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
508 |
m = GetIndustryAnimationState(tile); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
509 |
if (m == 6) { |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
510 |
SetIndustryAnimationState(tile, 0); |
0 | 511 |
DeleteAnimatedTile(tile); |
512 |
} else { |
|
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
513 |
SetIndustryAnimationState(tile, m + 1); |
0 | 514 |
MarkTileDirtyByTile(tile); |
515 |
} |
|
516 |
} |
|
517 |
break; |
|
518 |
||
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
|
519 |
case GFX_TOY_FACTORY: |
0 | 520 |
if ((_tick_counter & 1) == 0) { |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
521 |
m = GetIndustryAnimationState(tile) + 1; |
0 | 522 |
|
6964
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
523 |
switch (m) { |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
524 |
case 1: SndPlayTileFx(SND_2C_MACHINERY, tile); break; |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
525 |
case 23: SndPlayTileFx(SND_2B_COMEDY_HIT, tile); break; |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
526 |
case 28: SndPlayTileFx(SND_2A_EXTRACT_AND_POP, tile); break; |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
527 |
default: |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
528 |
if (m >= 50) { |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
529 |
int n = GetIndustryAnimationLoop(tile) + 1; |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
530 |
m = 0; |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
531 |
if (n >= 8) { |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
532 |
n = 0; |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
533 |
DeleteAnimatedTile(tile); |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
534 |
} |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
535 |
SetIndustryAnimationLoop(tile, n); |
737c8b546ca5
(svn r9644) -Codechange: if else cascade into a switch case
belugas
parents:
6963
diff
changeset
|
536 |
} |
0 | 537 |
} |
538 |
||
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
539 |
SetIndustryAnimationState(tile, m); |
0 | 540 |
MarkTileDirtyByTile(tile); |
541 |
} |
|
542 |
break; |
|
543 |
||
5685
b88aca81aa7b
(svn r7640) -Codechange: move a table from industry_cmd.c to table/industry_land
rubidium
parents:
5319
diff
changeset
|
544 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_1: case GFX_PLASTIC_FOUNTAIN_ANIMATED_2: |
b88aca81aa7b
(svn r7640) -Codechange: move a table from industry_cmd.c to table/industry_land
rubidium
parents:
5319
diff
changeset
|
545 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_3: case GFX_PLASTIC_FOUNTAIN_ANIMATED_4: |
b88aca81aa7b
(svn r7640) -Codechange: move a table from industry_cmd.c to table/industry_land
rubidium
parents:
5319
diff
changeset
|
546 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_5: case GFX_PLASTIC_FOUNTAIN_ANIMATED_6: |
b88aca81aa7b
(svn r7640) -Codechange: move a table from industry_cmd.c to table/industry_land
rubidium
parents:
5319
diff
changeset
|
547 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_7: case GFX_PLASTIC_FOUNTAIN_ANIMATED_8: |
0 | 548 |
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
|
549 |
IndustryGfx gfx = GetIndustryGfx(tile); |
0 | 550 |
|
3331 | 551 |
gfx = (gfx < 155) ? gfx + 1 : 148; |
552 |
SetIndustryGfx(tile, gfx); |
|
0 | 553 |
MarkTileDirtyByTile(tile); |
554 |
} |
|
555 |
break; |
|
556 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
557 |
case GFX_OILWELL_ANIMATED_1: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
558 |
case GFX_OILWELL_ANIMATED_2: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
559 |
case GFX_OILWELL_ANIMATED_3: |
0 | 560 |
if ((_tick_counter & 7) == 0) { |
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
561 |
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
|
562 |
IndustryGfx gfx = GetIndustryGfx(tile); |
3331 | 563 |
|
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
564 |
m = GetIndustryAnimationState(tile) + 1; |
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
565 |
if (m == 4 && (m = 0, ++gfx) == GFX_OILWELL_ANIMATED_3 + 1 && (gfx = GFX_OILWELL_ANIMATED_1, b)) { |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
566 |
SetIndustryGfx(tile, GFX_OILWELL_NOT_ANIMATED); |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
567 |
SetIndustryConstructionStage(tile, 3); |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
568 |
DeleteAnimatedTile(tile); |
0 | 569 |
} else { |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
570 |
SetIndustryAnimationState(tile, m); |
3331 | 571 |
SetIndustryGfx(tile, gfx); |
0 | 572 |
MarkTileDirtyByTile(tile); |
573 |
} |
|
574 |
} |
|
575 |
break; |
|
576 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
577 |
case GFX_COAL_MINE_TOWER_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
578 |
case GFX_COPPER_MINE_TOWER_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
579 |
case GFX_GOLD_MINE_TOWER_ANIMATED: { |
0 | 580 |
int state = _tick_counter & 0x7FF; |
581 |
||
582 |
if ((state -= 0x400) < 0) |
|
583 |
return; |
|
584 |
||
585 |
if (state < 0x1A0) { |
|
586 |
if (state < 0x20 || state >= 0x180) { |
|
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
587 |
m = GetIndustryAnimationState(tile); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
588 |
if (!(m & 0x40)) { |
5687
a6f0e780d714
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5686
diff
changeset
|
589 |
SetIndustryAnimationState(tile, m | 0x40); |
541 | 590 |
SndPlayTileFx(SND_0B_MINING_MACHINERY, tile); |
0 | 591 |
} |
592 |
if (state & 7) |
|
593 |
return; |
|
594 |
} else { |
|
595 |
if (state & 3) |
|
596 |
return; |
|
597 |
} |
|
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
598 |
m = (GetIndustryAnimationState(tile) + 1) | 0x40; |
0 | 599 |
if (m > 0xC2) m = 0xC0; |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
600 |
SetIndustryAnimationState(tile, m); |
0 | 601 |
MarkTileDirtyByTile(tile); |
602 |
} else if (state >= 0x200 && state < 0x3A0) { |
|
603 |
int i; |
|
604 |
i = (state < 0x220 || state >= 0x380) ? 7 : 3; |
|
605 |
if (state & i) |
|
606 |
return; |
|
607 |
||
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
608 |
m = (GetIndustryAnimationState(tile) & 0xBF) - 1; |
0 | 609 |
if (m < 0x80) m = 0x82; |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
610 |
SetIndustryAnimationState(tile, m); |
0 | 611 |
MarkTileDirtyByTile(tile); |
612 |
} |
|
613 |
} break; |
|
614 |
} |
|
615 |
} |
|
616 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
617 |
static void CreateIndustryEffectSmoke(TileIndex tile) |
0 | 618 |
{ |
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
|
619 |
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
|
620 |
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
|
621 |
uint z = GetTileMaxZ(tile); |
3094 | 622 |
|
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
|
623 |
CreateEffectVehicle(x + 15, y + 14, z + 59, EV_CHIMNEY_SMOKE); |
0 | 624 |
} |
625 |
||
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
|
626 |
static void MakeIndustryTileBigger(TileIndex tile) |
0 | 627 |
{ |
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
|
628 |
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
|
629 |
byte stage; |
0 | 630 |
|
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
|
631 |
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
|
632 |
SetIndustryConstructionCounter(tile, cnt); |
0 | 633 |
return; |
634 |
} |
|
635 |
||
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
|
636 |
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
|
637 |
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
|
638 |
SetIndustryConstructionStage(tile, stage); |
7725
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
639 |
StartStopIndustryTileAnimation(tile, IAT_CONSTRUCTION_STATE_CHANGE); |
7787
6e0b6ea38850
(svn r10639) -Codechange: Give meaninfull name to a magic number
belugas
parents:
7786
diff
changeset
|
640 |
if (stage == INDUSTRY_COMPLETED) SetIndustryCompleted(tile, true); |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
641 |
|
0 | 642 |
MarkTileDirtyByTile(tile); |
643 |
||
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
644 |
if (!IsIndustryCompleted(tile)) return; |
0 | 645 |
|
7725
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
646 |
IndustryGfx gfx = GetIndustryGfx(tile); |
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
647 |
if (gfx >= NEW_INDUSTRYTILEOFFSET) { |
8349
011e0ee04e43
(svn r11403) -Fix: NewIndustries GRF assume that tiles are already animated during construction.
rubidium
parents:
8348
diff
changeset
|
648 |
/* New industries are already animated on construction. */ |
7725
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
649 |
return; |
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
650 |
} |
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
651 |
|
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
652 |
switch (gfx) { |
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
653 |
case GFX_POWERPLANT_CHIMNEY: |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
654 |
CreateIndustryEffectSmoke(tile); |
0 | 655 |
break; |
656 |
||
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
|
657 |
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
|
658 |
if (GetIndustryGfx(tile + TileDiffXY(0, 1)) == GFX_OILRIG_1) BuildOilRig(tile); |
0 | 659 |
break; |
660 |
||
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
|
661 |
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
|
662 |
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
|
663 |
case GFX_TOFFEE_QUARY: |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
664 |
SetIndustryAnimationState(tile, 0); |
3538
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
665 |
SetIndustryAnimationLoop(tile, 0); |
0 | 666 |
break; |
667 |
||
5685
b88aca81aa7b
(svn r7640) -Codechange: move a table from industry_cmd.c to table/industry_land
rubidium
parents:
5319
diff
changeset
|
668 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_1: case GFX_PLASTIC_FOUNTAIN_ANIMATED_2: |
b88aca81aa7b
(svn r7640) -Codechange: move a table from industry_cmd.c to table/industry_land
rubidium
parents:
5319
diff
changeset
|
669 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_3: case GFX_PLASTIC_FOUNTAIN_ANIMATED_4: |
b88aca81aa7b
(svn r7640) -Codechange: move a table from industry_cmd.c to table/industry_land
rubidium
parents:
5319
diff
changeset
|
670 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_5: case GFX_PLASTIC_FOUNTAIN_ANIMATED_6: |
b88aca81aa7b
(svn r7640) -Codechange: move a table from industry_cmd.c to table/industry_land
rubidium
parents:
5319
diff
changeset
|
671 |
case GFX_PLASTIC_FOUNTAIN_ANIMATED_7: case GFX_PLASTIC_FOUNTAIN_ANIMATED_8: |
0 | 672 |
AddAnimatedTile(tile); |
673 |
break; |
|
674 |
} |
|
675 |
} |
|
676 |
||
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
677 |
static void TileLoopIndustry_BubbleGenerator(TileIndex tile) |
0 | 678 |
{ |
679 |
int dir; |
|
680 |
Vehicle *v; |
|
681 |
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
|
682 |
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
|
683 |
-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
|
684 |
49, 59, 60, 65, |
0 | 685 |
}; |
686 |
||
541 | 687 |
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
|
688 |
|
0 | 689 |
dir = Random() & 3; |
690 |
||
691 |
v = CreateEffectVehicleAbove( |
|
3421
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3418
diff
changeset
|
692 |
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
|
693 |
TileY(tile) * TILE_SIZE + _tileloop_ind_case_161[dir + 4], |
0 | 694 |
_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
|
695 |
EV_BUBBLE |
0 | 696 |
); |
697 |
||
7830
210381b46ae6
(svn r10697) -Codechange: give a more sensible names to some of the unkX variables.
rubidium
parents:
7829
diff
changeset
|
698 |
if (v != NULL) v->u.special.animation_substate = dir; |
0 | 699 |
} |
700 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
701 |
static void TileLoop_Industry(TileIndex tile) |
0 | 702 |
{ |
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
|
703 |
IndustryGfx newgfx; |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
704 |
IndustryGfx gfx; |
0 | 705 |
|
8356
4d72bac74977
(svn r11410) -Codechange: implement random triggers for industries.
rubidium
parents:
8349
diff
changeset
|
706 |
TriggerIndustryTile(tile, INDTILE_TRIGGER_TILE_LOOP); |
4d72bac74977
(svn r11410) -Codechange: implement random triggers for industries.
rubidium
parents:
8349
diff
changeset
|
707 |
|
3321
c5f2375046bc
(svn r4087) Add IsIndustryCompleted() to check if a industry tile is fully built
tron
parents:
3320
diff
changeset
|
708 |
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
|
709 |
MakeIndustryTileBigger(tile); |
0 | 710 |
return; |
711 |
} |
|
712 |
||
2639 | 713 |
if (_game_mode == GM_EDITOR) return; |
0 | 714 |
|
715 |
TransportIndustryGoods(tile); |
|
716 |
||
7725
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
717 |
if (StartStopIndustryTileAnimation(tile, IAT_TILELOOP)) return; |
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
718 |
|
6631
dc3480a670cc
(svn r9162) -Codechange: Cleanup of industry_cmd (Step-8). Gather tile animation data into IndustryTileSpec array
belugas
parents:
6609
diff
changeset
|
719 |
newgfx = GetIndustryTileSpec(GetIndustryGfx(tile))->anim_next; |
7239
68e722150cba
(svn r9976) -Codechange: Declare a writable array of specs for industry and industry tiles.
belugas
parents:
7232
diff
changeset
|
720 |
if (newgfx != INDUSTRYTILE_NOANIM) { |
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
|
721 |
ResetIndustryConstructionStage(tile); |
3331 | 722 |
SetIndustryGfx(tile, newgfx); |
0 | 723 |
MarkTileDirtyByTile(tile); |
724 |
return; |
|
725 |
} |
|
726 |
||
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
727 |
gfx = GetIndustryGfx(tile); |
0 | 728 |
|
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
729 |
switch (gfx) { |
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
730 |
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
|
731 |
case GFX_OILRIG_2: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
732 |
case GFX_OILRIG_3: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
733 |
case GFX_OILRIG_4: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
734 |
case GFX_OILRIG_5: |
43
3b93861c5478
(svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel)
dominik
parents:
39
diff
changeset
|
735 |
TileLoop_Water(tile); |
3b93861c5478
(svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel)
dominik
parents:
39
diff
changeset
|
736 |
break; |
3b93861c5478
(svn r44) Fix: Coast line near edge of map and near oilrigs (Dribbel)
dominik
parents:
39
diff
changeset
|
737 |
|
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
738 |
case GFX_COAL_MINE_TOWER_NOT_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
739 |
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
|
740 |
case GFX_GOLD_MINE_TOWER_NOT_ANIMATED: |
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
741 |
if (!(_tick_counter & 0x400) && Chance16(1, 2)) { |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
742 |
switch (gfx) { |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
743 |
case GFX_COAL_MINE_TOWER_NOT_ANIMATED: gfx = GFX_COAL_MINE_TOWER_ANIMATED; break; |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
744 |
case GFX_COPPER_MINE_TOWER_NOT_ANIMATED: gfx = GFX_COPPER_MINE_TOWER_ANIMATED; break; |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
745 |
case GFX_GOLD_MINE_TOWER_NOT_ANIMATED: gfx = GFX_GOLD_MINE_TOWER_ANIMATED; break; |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
746 |
} |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
747 |
SetIndustryGfx(tile, gfx); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
748 |
SetIndustryAnimationState(tile, 0x80); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
749 |
AddAnimatedTile(tile); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
750 |
} |
0 | 751 |
break; |
752 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
753 |
case GFX_OILWELL_NOT_ANIMATED: |
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
754 |
if (Chance16(1, 6)) { |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
755 |
SetIndustryGfx(tile, GFX_OILWELL_ANIMATED_1); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
756 |
SetIndustryAnimationState(tile, 0); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
757 |
AddAnimatedTile(tile); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
758 |
} |
0 | 759 |
break; |
760 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
761 |
case GFX_COAL_MINE_TOWER_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
762 |
case GFX_COPPER_MINE_TOWER_ANIMATED: |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
763 |
case GFX_GOLD_MINE_TOWER_ANIMATED: |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
764 |
if (!(_tick_counter & 0x400)) { |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
765 |
switch (gfx) { |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
766 |
case GFX_COAL_MINE_TOWER_ANIMATED: gfx = GFX_COAL_MINE_TOWER_NOT_ANIMATED; break; |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
767 |
case GFX_COPPER_MINE_TOWER_ANIMATED: gfx = GFX_COPPER_MINE_TOWER_NOT_ANIMATED; break; |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
768 |
case GFX_GOLD_MINE_TOWER_ANIMATED: gfx = GFX_GOLD_MINE_TOWER_NOT_ANIMATED; break; |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
769 |
} |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
770 |
SetIndustryGfx(tile, gfx); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
771 |
SetIndustryCompleted(tile, true); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
772 |
SetIndustryConstructionStage(tile, 3); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
773 |
DeleteAnimatedTile(tile); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
774 |
} |
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
775 |
break; |
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
776 |
|
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
777 |
case GFX_POWERPLANT_SPARKS: |
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
778 |
if (Chance16(1, 3)) { |
541 | 779 |
SndPlayTileFx(SND_0C_ELECTRIC_SPARK, tile); |
0 | 780 |
AddAnimatedTile(tile); |
781 |
} |
|
782 |
break; |
|
783 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
784 |
case GFX_COPPER_MINE_CHIMNEY: |
3421
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3418
diff
changeset
|
785 |
CreateEffectVehicleAbove(TileX(tile) * TILE_SIZE + 6, TileY(tile) * TILE_SIZE + 6, 43, EV_SMOKE); |
2639 | 786 |
break; |
0 | 787 |
|
788 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
789 |
case GFX_TOY_FACTORY: { |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
790 |
Industry *i = GetIndustryByTile(tile); |
0 | 791 |
if (i->was_cargo_delivered) { |
792 |
i->was_cargo_delivered = false; |
|
3538
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
793 |
SetIndustryAnimationLoop(tile, 0); |
0 | 794 |
AddAnimatedTile(tile); |
795 |
} |
|
796 |
} |
|
797 |
break; |
|
798 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
799 |
case GFX_BUBBLE_GENERATOR: |
3290
1a02d5e9205c
(svn r4004) -CodeChange : Renaming sprites and functions
belugas
parents:
3282
diff
changeset
|
800 |
TileLoopIndustry_BubbleGenerator(tile); |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
801 |
break; |
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
802 |
|
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
803 |
case GFX_TOFFEE_QUARY: |
0 | 804 |
AddAnimatedTile(tile); |
805 |
break; |
|
806 |
||
4583
45b8bf91b1e3
(svn r6433) -Codechange: replace some magic numbers (industry gfx indices) by enums.
rubidium
parents:
4434
diff
changeset
|
807 |
case GFX_SUGAR_MINE_SIEVE: |
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
808 |
if (Chance16(1, 3)) AddAnimatedTile(tile); |
0 | 809 |
break; |
810 |
} |
|
811 |
} |
|
812 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
813 |
static void ClickTile_Industry(TileIndex tile) |
0 | 814 |
{ |
3314
b8b234d4584f
(svn r4077) Add GetIndustry{Index,ByTile}() to get the industry index resp. the industry from a tile
tron
parents:
3296
diff
changeset
|
815 |
ShowIndustryViewWindow(GetIndustryIndex(tile)); |
0 | 816 |
} |
817 |
||
7179
3e123c2b7c93
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
rubidium
parents:
7152
diff
changeset
|
818 |
static uint32 GetTileTrackStatus_Industry(TileIndex tile, TransportType mode, uint sub_mode) |
0 | 819 |
{ |
820 |
return 0; |
|
821 |
} |
|
822 |
||
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
|
823 |
static void GetProducedCargo_Industry(TileIndex tile, CargoID *b) |
0 | 824 |
{ |
8141
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
825 |
const Industry *i = GetIndustryByTile(tile); |
2630 | 826 |
|
0 | 827 |
b[0] = i->produced_cargo[0]; |
828 |
b[1] = i->produced_cargo[1]; |
|
829 |
} |
|
830 |
||
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
|
831 |
static void ChangeTileOwner_Industry(TileIndex tile, PlayerID old_player, PlayerID new_player) |
0 | 832 |
{ |
7682
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
833 |
/* If the founder merges, the industry was created by the merged company */ |
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
834 |
Industry *i = GetIndustryByTile(tile); |
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
835 |
if (i->founder == old_player) i->founder = (new_player == PLAYER_SPECTATOR) ? OWNER_NONE : new_player; |
0 | 836 |
} |
837 |
||
838 |
static const byte _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6}; |
|
839 |
||
1048 | 840 |
static bool IsBadFarmFieldTile(TileIndex tile) |
0 | 841 |
{ |
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1209
diff
changeset
|
842 |
switch (GetTileType(tile)) { |
5935
6f5ae5d8d407
(svn r8145) -Featurette: Allow for Tropic Farm to plant fields after producing cargo, like its counterpart in temperate climate.
belugas
parents:
5919
diff
changeset
|
843 |
case MP_CLEAR: return IsClearGround(tile, CLEAR_FIELDS) || IsClearGround(tile, CLEAR_SNOW) || IsClearGround(tile, CLEAR_DESERT); |
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
|
844 |
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
|
845 |
default: return true; |
0 | 846 |
} |
847 |
} |
|
848 |
||
1048 | 849 |
static bool IsBadFarmFieldTile2(TileIndex tile) |
0 | 850 |
{ |
1214
33e07bbb7779
(svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents:
1209
diff
changeset
|
851 |
switch (GetTileType(tile)) { |
5935
6f5ae5d8d407
(svn r8145) -Featurette: Allow for Tropic Farm to plant fields after producing cargo, like its counterpart in temperate climate.
belugas
parents:
5919
diff
changeset
|
852 |
case MP_CLEAR: return IsClearGround(tile, CLEAR_SNOW) || IsClearGround(tile, CLEAR_DESERT); |
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
|
853 |
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
|
854 |
default: return true; |
0 | 855 |
} |
856 |
} |
|
857 |
||
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
858 |
static void SetupFarmFieldFence(TileIndex tile, int size, byte type, Axis direction) |
0 | 859 |
{ |
860 |
do { |
|
861 |
tile = TILE_MASK(tile); |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
862 |
|
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
|
863 |
if (IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES)) { |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
864 |
byte or_ = type; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
865 |
|
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
866 |
if (or_ == 1 && Chance16(1, 7)) or_ = 2; |
0 | 867 |
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
868 |
if (direction == AXIS_X) { |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
869 |
SetFenceSE(tile, or_); |
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
870 |
} else { |
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
871 |
SetFenceSW(tile, or_); |
0 | 872 |
} |
873 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
874 |
|
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
875 |
tile += (direction == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1)); |
0 | 876 |
} while (--size); |
877 |
} |
|
878 |
||
4330
7306bda145ab
(svn r6005) -Cleanup: introduce IndustryID and use it
rubidium
parents:
4329
diff
changeset
|
879 |
static void PlantFarmField(TileIndex tile, IndustryID industry) |
0 | 880 |
{ |
881 |
uint size_x, size_y; |
|
882 |
uint32 r; |
|
2133 | 883 |
uint count; |
2979
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
884 |
uint counter; |
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
885 |
uint field_type; |
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
886 |
int type; |
0 | 887 |
|
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6669
diff
changeset
|
888 |
if (_opt.landscape == LT_ARCTIC) { |
6669
487ac09b95c4
(svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents:
6633
diff
changeset
|
889 |
if (GetTileZ(tile) + TILE_HEIGHT * 2 >= GetSnowLine()) |
0 | 890 |
return; |
891 |
} |
|
892 |
||
893 |
/* determine field size */ |
|
894 |
r = (Random() & 0x303) + 0x404; |
|
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6669
diff
changeset
|
895 |
if (_opt.landscape == LT_ARCTIC) r += 0x404; |
2150
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2148
diff
changeset
|
896 |
size_x = GB(r, 0, 8); |
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2148
diff
changeset
|
897 |
size_y = GB(r, 8, 8); |
0 | 898 |
|
899 |
/* offset tile to match size */ |
|
1981 | 900 |
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
|
901 |
|
0 | 902 |
/* check the amount of bad tiles */ |
903 |
count = 0; |
|
904 |
BEGIN_TILE_LOOP(cur_tile, size_x, size_y, tile) |
|
905 |
cur_tile = TILE_MASK(cur_tile); |
|
906 |
count += IsBadFarmFieldTile(cur_tile); |
|
907 |
END_TILE_LOOP(cur_tile, size_x, size_y, tile) |
|
2133 | 908 |
if (count * 2 >= size_x * size_y) return; |
0 | 909 |
|
910 |
/* determine type of field */ |
|
911 |
r = Random(); |
|
2979
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
912 |
counter = GB(r, 5, 3); |
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
913 |
field_type = GB(r, 8, 8) * 9 >> 8; |
0 | 914 |
|
915 |
/* make field */ |
|
916 |
BEGIN_TILE_LOOP(cur_tile, size_x, size_y, tile) |
|
917 |
cur_tile = TILE_MASK(cur_tile); |
|
918 |
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
|
919 |
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
|
920 |
SetClearCounter(cur_tile, counter); |
883788245931
(svn r3554) Add accessors for the field type and fences of clear tiles
tron
parents:
2955
diff
changeset
|
921 |
MarkTileDirtyByTile(cur_tile); |
0 | 922 |
} |
923 |
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
|
924 |
|
0 | 925 |
type = 3; |
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6669
diff
changeset
|
926 |
if (_opt.landscape != LT_ARCTIC && _opt.landscape != LT_TROPIC) { |
0 | 927 |
type = _plantfarmfield_type[Random() & 0xF]; |
928 |
} |
|
929 |
||
3157
40de8616c04c
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
tron
parents:
3144
diff
changeset
|
930 |
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
|
931 |
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
|
932 |
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
|
933 |
SetupFarmFieldFence(tile + TileDiffXY(0, size_y - 1), size_x, type, AXIS_X); |
0 | 934 |
} |
935 |
||
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
|
936 |
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
|
937 |
{ |
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
|
938 |
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
|
939 |
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
|
940 |
|
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
|
941 |
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
|
942 |
|
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
|
943 |
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
|
944 |
} |
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
|
945 |
|
5118
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
946 |
/** |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
947 |
* Search callback function for ChopLumberMillTrees |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
948 |
* @param tile to test |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
949 |
* @param data that is passed by the caller. In this case, nothing |
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
950 |
* @return the result of the test |
5118
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
951 |
*/ |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
952 |
static bool SearchLumberMillTrees(TileIndex tile, uint32 data) |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
953 |
{ |
6160
126831e48987
(svn r8535) -Feature: Allow lumbermill to cut trees only when they are full grown.
belugas
parents:
6135
diff
changeset
|
954 |
if (IsTileType(tile, MP_TREES) && GetTreeGrowth(tile) > 2) { ///< 3 and up means all fully grown trees |
5118
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
955 |
PlayerID old_player = _current_player; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
956 |
/* found a tree */ |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
957 |
|
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
958 |
_current_player = OWNER_NONE; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
959 |
_industry_sound_ctr = 1; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
960 |
_industry_sound_tile = tile; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
961 |
SndPlayTileFx(SND_38_CHAINSAW, tile); |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
962 |
|
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
963 |
DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
964 |
|
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
965 |
_current_player = old_player; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
966 |
return true; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
967 |
} |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
968 |
return false; |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
969 |
} |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
970 |
|
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
971 |
/** |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
972 |
* 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
|
973 |
* @param i industry |
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
974 |
*/ |
0 | 975 |
static void ChopLumberMillTrees(Industry *i) |
976 |
{ |
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
977 |
TileIndex tile = i->xy; |
2639 | 978 |
|
5118
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
979 |
if (!IsIndustryCompleted(tile)) return; ///< Can't proceed if not completed |
0 | 980 |
|
5118
5a56a0f12206
(svn r7198) -Codechange: Implement a circular tile search function.
belugas
parents:
5056
diff
changeset
|
981 |
if (CircularTileSearch(tile, 40, SearchLumberMillTrees, 0)) ///< 40x40 tiles to search |
7661
40c7a63ad9a1
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7647
diff
changeset
|
982 |
i->produced_cargo_waiting[0] = min(0xffff, i->produced_cargo_waiting[0] + 45); ///< Found a tree, add according value to waiting cargo |
0 | 983 |
} |
984 |
||
985 |
static void ProduceIndustryGoods(Industry *i) |
|
986 |
{ |
|
987 |
uint32 r; |
|
988 |
uint num; |
|
7151
d811c3f808bd
(svn r9886) -Codechange: Cleanup of industries (Step-13). Include the sounds table into the industry's spec.
belugas
parents:
7135
diff
changeset
|
989 |
const IndustrySpec *indsp = GetIndustrySpec(i->type); |
0 | 990 |
|
991 |
/* play a sound? */ |
|
992 |
if ((i->counter & 0x3F) == 0) { |
|
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
993 |
if (Chance16R(1, 14, r) && (num = indsp->number_of_sounds) != 0) { |
0 | 994 |
SndPlayTileFx( |
7151
d811c3f808bd
(svn r9886) -Codechange: Cleanup of industries (Step-13). Include the sounds table into the industry's spec.
belugas
parents:
7135
diff
changeset
|
995 |
(SoundFx)(indsp->random_sounds[((r >> 16) * num) >> 16]), |
0 | 996 |
i->xy); |
997 |
} |
|
998 |
} |
|
999 |
||
1000 |
i->counter--; |
|
1001 |
||
1002 |
/* produce some cargo */ |
|
1003 |
if ((i->counter & 0xFF) == 0) { |
|
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1004 |
if (HasBit(indsp->callback_flags, CBM_IND_PRODUCTION_256_TICKS)) IndustryProductionCallback(i, 1); |
7664
81c35390400e
(svn r10442) -Codechange: implement the industry production callback.
rubidium
parents:
7661
diff
changeset
|
1005 |
|
8253 | 1006 |
IndustryBehaviour indbehav = indsp->behaviour; |
7661
40c7a63ad9a1
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7647
diff
changeset
|
1007 |
i->produced_cargo_waiting[0] = min(0xffff, i->produced_cargo_waiting[0] + i->production_rate[0]); |
40c7a63ad9a1
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7647
diff
changeset
|
1008 |
i->produced_cargo_waiting[1] = min(0xffff, i->produced_cargo_waiting[1] + i->production_rate[1]); |
0 | 1009 |
|
7701
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1010 |
if ((indbehav & INDUSTRYBEH_PLANT_FIELDS) != 0) { |
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1011 |
bool plant; |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1012 |
if (HasBit(indsp->callback_flags, CBM_IND_SPECIAL_EFFECT)) { |
7701
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1013 |
plant = (GetIndustryCallback(CBID_INDUSTRY_SPECIAL_EFFECT, Random(), 0, i, i->type, i->xy) != 0); |
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1014 |
} else { |
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
1015 |
plant = Chance16(1, 8); |
7701
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1016 |
} |
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1017 |
|
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1018 |
if (plant) PlantRandomFarmField(i); |
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1019 |
} |
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1020 |
if ((indbehav & INDUSTRYBEH_CUT_TREES) != 0) { |
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1021 |
bool cut = ((i->counter & 0x1FF) == 0); |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1022 |
if (HasBit(indsp->callback_flags, CBM_IND_SPECIAL_EFFECT)) { |
7701
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1023 |
cut = (GetIndustryCallback(CBID_INDUSTRY_SPECIAL_EFFECT, 0, 1, i, i->type, i->xy) != 0); |
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1024 |
} |
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1025 |
|
72d4e674ca6e
(svn r10483) -Codechange: add support for callbacks to manipulate the building chance of farm fields and chopping chance for lumber mills.
rubidium
parents:
7699
diff
changeset
|
1026 |
if (cut) ChopLumberMillTrees(i); |
2639 | 1027 |
} |
0 | 1028 |
} |
1029 |
} |
|
1030 |
||
6573 | 1031 |
void OnTick_Industry() |
0 | 1032 |
{ |
1033 |
Industry *i; |
|
1034 |
||
1035 |
if (_industry_sound_ctr != 0) { |
|
1036 |
_industry_sound_ctr++; |
|
1037 |
||
1038 |
if (_industry_sound_ctr == 75) { |
|
541 | 1039 |
SndPlayTileFx(SND_37_BALLOON_SQUEAK, _industry_sound_tile); |
0 | 1040 |
} 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
|
1041 |
_industry_sound_ctr = 0; |
541 | 1042 |
SndPlayTileFx(SND_36_CARTOON_CRASH, _industry_sound_tile); |
0 | 1043 |
} |
1044 |
} |
|
1045 |
||
2639 | 1046 |
if (_game_mode == GM_EDITOR) return; |
0 | 1047 |
|
830
8114845804c9
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
817
diff
changeset
|
1048 |
FOR_ALL_INDUSTRIES(i) { |
8356
4d72bac74977
(svn r11410) -Codechange: implement random triggers for industries.
rubidium
parents:
8349
diff
changeset
|
1049 |
TriggerIndustry(i, INDUSTRY_TRIGGER_INDUSTRY_TICK); |
7725
e3892b38aa14
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7723
diff
changeset
|
1050 |
StartStopIndustryTileAnimation(i, IAT_INDUSTRY_TICK); |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1051 |
ProduceIndustryGoods(i); |
0 | 1052 |
} |
1053 |
} |
|
1054 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1055 |
static bool CheckNewIndustry_NULL(TileIndex tile) |
0 | 1056 |
{ |
1057 |
return true; |
|
1058 |
} |
|
1059 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1060 |
static bool CheckNewIndustry_Forest(TileIndex tile) |
0 | 1061 |
{ |
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6669
diff
changeset
|
1062 |
if (_opt.landscape == LT_ARCTIC) { |
6669
487ac09b95c4
(svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents:
6633
diff
changeset
|
1063 |
if (GetTileZ(tile) < HighestSnowLine() + TILE_HEIGHT * 2U) { |
0 | 1064 |
_error_message = STR_4831_FOREST_CAN_ONLY_BE_PLANTED; |
1065 |
return false; |
|
1066 |
} |
|
1067 |
} |
|
1068 |
return true; |
|
1069 |
} |
|
1070 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1071 |
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
|
1072 |
{ |
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1073 |
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
|
1074 |
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
|
1075 |
|
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1076 |
_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
|
1077 |
return false; |
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1078 |
} |
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1079 |
|
7
f2e623faa778
(svn r8) Fix: Automatic oil refinery generation in editor
dominik
parents:
0
diff
changeset
|
1080 |
extern bool _ignore_restrictions; |
f2e623faa778
(svn r8) Fix: Automatic oil refinery generation in editor
dominik
parents:
0
diff
changeset
|
1081 |
|
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1082 |
static bool CheckNewIndustry_OilRig(TileIndex tile) |
0 | 1083 |
{ |
2639 | 1084 |
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
|
1085 |
if (TileHeight(tile) == 0 && |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1086 |
DistanceFromEdge(TILE_ADDXY(tile, 1, 1)) < _patches.oil_refinery_limit) return true; |
0 | 1087 |
|
1088 |
_error_message = STR_483B_CAN_ONLY_BE_POSITIONED; |
|
1089 |
return false; |
|
1090 |
} |
|
1091 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1092 |
static bool CheckNewIndustry_Farm(TileIndex tile) |
0 | 1093 |
{ |
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6669
diff
changeset
|
1094 |
if (_opt.landscape == LT_ARCTIC) { |
6669
487ac09b95c4
(svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents:
6633
diff
changeset
|
1095 |
if (GetTileZ(tile) + TILE_HEIGHT * 2 >= HighestSnowLine()) { |
0 | 1096 |
_error_message = STR_0239_SITE_UNSUITABLE; |
1097 |
return false; |
|
1098 |
} |
|
1099 |
} |
|
1100 |
return true; |
|
1101 |
} |
|
1102 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1103 |
static bool CheckNewIndustry_Plantation(TileIndex tile) |
0 | 1104 |
{ |
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
|
1105 |
if (GetTropicZone(tile) == TROPICZONE_DESERT) { |
0 | 1106 |
_error_message = STR_0239_SITE_UNSUITABLE; |
1107 |
return false; |
|
1108 |
} |
|
1109 |
||
1110 |
return true; |
|
1111 |
} |
|
1112 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1113 |
static bool CheckNewIndustry_Water(TileIndex tile) |
0 | 1114 |
{ |
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
|
1115 |
if (GetTropicZone(tile) != TROPICZONE_DESERT) { |
0 | 1116 |
_error_message = STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT; |
1117 |
return false; |
|
1118 |
} |
|
1119 |
||
1120 |
return true; |
|
1121 |
} |
|
1122 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1123 |
static bool CheckNewIndustry_Lumbermill(TileIndex tile) |
0 | 1124 |
{ |
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
|
1125 |
if (GetTropicZone(tile) != TROPICZONE_RAINFOREST) { |
0 | 1126 |
_error_message = STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST; |
1127 |
return false; |
|
1128 |
} |
|
1129 |
return true; |
|
1130 |
} |
|
1131 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1132 |
static bool CheckNewIndustry_BubbleGen(TileIndex tile) |
0 | 1133 |
{ |
3645
86af43f87885
(svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents:
3636
diff
changeset
|
1134 |
return GetTileZ(tile) <= TILE_HEIGHT * 4; |
0 | 1135 |
} |
1136 |
||
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1137 |
typedef bool CheckNewIndustryProc(TileIndex tile); |
3663
50fbc1639a3f
(svn r4578) CodeChange : Cleanup of industry_cmd (Step-2).
belugas
parents:
3662
diff
changeset
|
1138 |
static CheckNewIndustryProc * const _check_new_industry_procs[CHECK_END] = { |
0 | 1139 |
CheckNewIndustry_NULL, |
1140 |
CheckNewIndustry_Forest, |
|
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1141 |
CheckNewIndustry_OilRefinery, |
0 | 1142 |
CheckNewIndustry_Farm, |
1143 |
CheckNewIndustry_Plantation, |
|
1144 |
CheckNewIndustry_Water, |
|
1145 |
CheckNewIndustry_Lumbermill, |
|
1146 |
CheckNewIndustry_BubbleGen, |
|
3877
53efa8118448
(svn r4920) Remove parameters, which get only used in certain functions, by splitting those functions.
tron
parents:
3773
diff
changeset
|
1147 |
CheckNewIndustry_OilRig |
0 | 1148 |
}; |
1149 |
||
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
1150 |
static bool CheckSuitableIndustryPos(TileIndex tile) |
0 | 1151 |
{ |
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
|
1152 |
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
|
1153 |
uint y = TileY(tile); |
0 | 1154 |
|
2639 | 1155 |
if (x < 2 || y < 2 || x > MapMaxX() - 3 || y > MapMaxY() - 3) { |
0 | 1156 |
_error_message = STR_0239_SITE_UNSUITABLE; |
1157 |
return false; |
|
1158 |
} |
|
1159 |
||
1160 |
return true; |
|
1161 |
} |
|
1162 |
||
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
1163 |
static const Town *CheckMultipleIndustryInTown(TileIndex tile, int type) |
0 | 1164 |
{ |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
1165 |
const Town *t; |
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
1166 |
const Industry *i; |
0 | 1167 |
|
1168 |
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
|
1169 |
|
2639 | 1170 |
if (_patches.multiple_industry_per_town) return t; |
0 | 1171 |
|
830
8114845804c9
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
817
diff
changeset
|
1172 |
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
|
1173 |
if (i->type == (byte)type && |
0 | 1174 |
i->town == t) { |
1175 |
_error_message = STR_0287_ONLY_ONE_ALLOWED_PER_TOWN; |
|
1176 |
return NULL; |
|
1177 |
} |
|
1178 |
} |
|
1179 |
||
1180 |
return t; |
|
1181 |
} |
|
1182 |
||
8158
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1183 |
bool IsSlopeRefused(Slope current, Slope refused) |
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1184 |
{ |
8229
580e6d337be5
(svn r11268) -Fix[FS#1336]: Call IsSlopeRefused whenever it is required. Looks like there was one spot missing. Thanks frosch
belugas
parents:
8172
diff
changeset
|
1185 |
if (IsSteepSlope(current)) return true; |
8158
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1186 |
if (current != SLOPE_FLAT) { |
8526
3804c50aeb9f
(svn r11590) -Fix (r11193): IsSlopeRefused() result was half wrong
glx
parents:
8485
diff
changeset
|
1187 |
if (IsSteepSlope(refused)) return true; |
8158
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1188 |
|
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1189 |
Slope t = ComplementSlope(current); |
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1190 |
|
8526
3804c50aeb9f
(svn r11590) -Fix (r11193): IsSlopeRefused() result was half wrong
glx
parents:
8485
diff
changeset
|
1191 |
if (refused & SLOPE_W && (t & SLOPE_NW)) return true; |
3804c50aeb9f
(svn r11590) -Fix (r11193): IsSlopeRefused() result was half wrong
glx
parents:
8485
diff
changeset
|
1192 |
if (refused & SLOPE_S && (t & SLOPE_NE)) return true; |
3804c50aeb9f
(svn r11590) -Fix (r11193): IsSlopeRefused() result was half wrong
glx
parents:
8485
diff
changeset
|
1193 |
if (refused & SLOPE_E && (t & SLOPE_SW)) return true; |
3804c50aeb9f
(svn r11590) -Fix (r11193): IsSlopeRefused() result was half wrong
glx
parents:
8485
diff
changeset
|
1194 |
if (refused & SLOPE_N && (t & SLOPE_SE)) return true; |
8158
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1195 |
} |
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1196 |
|
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1197 |
return false; |
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1198 |
} |
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1199 |
|
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1200 |
static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable *it, uint itspec_index, int type, bool *custom_shape_check = NULL) |
0 | 1201 |
{ |
1202 |
_error_message = STR_0239_SITE_UNSUITABLE; |
|
8159
7a36d78b2343
(svn r11194) -Fix: industries with not all tiles custom slope checked (but at least one) would be build on wrongly sloped tiles.
rubidium
parents:
8158
diff
changeset
|
1203 |
bool refused_slope = false; |
7a36d78b2343
(svn r11194) -Fix: industries with not all tiles custom slope checked (but at least one) would be build on wrongly sloped tiles.
rubidium
parents:
8158
diff
changeset
|
1204 |
bool custom_shape = false; |
0 | 1205 |
|
1206 |
do { |
|
7963
e04dbb203f3e
(svn r10972) -Codechange: Implement the counterpart(GetTranslatedIndustryTileID) of getindustileid of TTDPatch. This allows to ensure that the ID of a tile (taken out of the map or not) is still a valid one regarding the possible override it may have been flagged to.
belugas
parents:
7958
diff
changeset
|
1207 |
IndustryGfx gfx = GetTranslatedIndustryTileID(it->gfx); |
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
1208 |
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
|
1209 |
|
0 | 1210 |
if (!IsValidTile(cur_tile)) { |
7969
9050701304bd
(svn r10980) -Fix [FS#1158] : This will hopefully fix the case of an assert that happens when an industry uses a special gfx index (tile spec 0xFF). This 0xFF is the sentinel of a special check done for oil rigs, where water need to be around, but no tile will be constructed on it.
belugas
parents:
7963
diff
changeset
|
1211 |
if (gfx == GFX_WATERTILE_SPECIALCHECK) continue; |
0 | 1212 |
return false; |
1213 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1214 |
|
7969
9050701304bd
(svn r10980) -Fix [FS#1158] : This will hopefully fix the case of an assert that happens when an industry uses a special gfx index (tile spec 0xFF). This 0xFF is the sentinel of a special check done for oil rigs, where water need to be around, but no tile will be constructed on it.
belugas
parents:
7963
diff
changeset
|
1215 |
if (gfx == GFX_WATERTILE_SPECIALCHECK) { |
3296
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1216 |
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
|
1217 |
GetTileSlope(cur_tile, NULL) != SLOPE_FLAT) { |
3296
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1218 |
return false; |
69c0c6e467bb
(svn r4027) Remove another call to FindLandscapeHeightByTile()
tron
parents:
3291
diff
changeset
|
1219 |
} |
0 | 1220 |
} else { |
8254
5de2bbd26163
(svn r11303) -Fix: EnsureNoVehicle and EnsureNoVehicleOnGround were both used to check whether there was no vehicle on the ground, except that the former didn't take care of aircraft shadows. So now we only use EnsureNoVehicleOnGround.
rubidium
parents:
8253
diff
changeset
|
1221 |
if (!EnsureNoVehicleOnGround(cur_tile)) return false; |
7389
d8bc6472130b
(svn r10140) -Fix [FS#867]: an industry could overbuild a bridge.
rubidium
parents:
7355
diff
changeset
|
1222 |
if (MayHaveBridgeAbove(cur_tile) && IsBridgeAbove(cur_tile)) return false; |
d8bc6472130b
(svn r10140) -Fix [FS#867]: an industry could overbuild a bridge.
rubidium
parents:
7355
diff
changeset
|
1223 |
|
8027
80ddda328596
(svn r11050) -Codechange: Use the translated gfx, not the original one.
belugas
parents:
8018
diff
changeset
|
1224 |
const IndustryTileSpec *its = GetIndustryTileSpec(gfx); |
80ddda328596
(svn r11050) -Codechange: Use the translated gfx, not the original one.
belugas
parents:
8018
diff
changeset
|
1225 |
|
8253 | 1226 |
IndustryBehaviour ind_behav = GetIndustrySpec(type)->behaviour; |
0 | 1227 |
|
8252
396c795ecf31
(svn r11301) -Fix: water check when building industries didn't work
glx
parents:
8251
diff
changeset
|
1228 |
/* Perform land/water check if not disabled */ |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1229 |
if (!HasBit(its->slopes_refused, 5) && (IsWaterTile(cur_tile) == !(ind_behav & INDUSTRYBEH_BUILT_ONWATER))) return false; |
8252
396c795ecf31
(svn r11301) -Fix: water check when building industries didn't work
glx
parents:
8251
diff
changeset
|
1230 |
|
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1231 |
if (HasBit(its->callback_flags, CBM_INDT_SHAPE_CHECK)) { |
8159
7a36d78b2343
(svn r11194) -Fix: industries with not all tiles custom slope checked (but at least one) would be build on wrongly sloped tiles.
rubidium
parents:
8158
diff
changeset
|
1232 |
custom_shape = true; |
8158
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1233 |
if (!PerformIndustryTileSlopeCheck(tile, cur_tile, its, type, gfx, itspec_index)) return false; |
0 | 1234 |
} else { |
8252
396c795ecf31
(svn r11301) -Fix: water check when building industries didn't work
glx
parents:
8251
diff
changeset
|
1235 |
Slope tileh = GetTileSlope(cur_tile, NULL); |
396c795ecf31
(svn r11301) -Fix: water check when building industries didn't work
glx
parents:
8251
diff
changeset
|
1236 |
refused_slope |= IsSlopeRefused(tileh, its->slopes_refused); |
7708
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1237 |
} |
0 | 1238 |
|
8348
0e073a15c792
(svn r11402) -Fix [FS#1382]: incorrect handling of industry behaviour 'must be in town with population large than 1200'
glx
parents:
8345
diff
changeset
|
1239 |
if (ind_behav & (INDUSTRYBEH_ONLY_INTOWN | INDUSTRYBEH_TOWN1200_MORE)) { |
7708
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1240 |
if (!IsTileType(cur_tile, MP_HOUSE)) { |
8485
3319dc8510e0
(svn r11545) -Revert(r11543): The result is not what was expected. Looks like more work might be needed
belugas
parents:
8483
diff
changeset
|
1241 |
_error_message = STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS; |
7708
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1242 |
return false; |
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1243 |
} |
7723
e6785e8fec08
(svn r10506) -Fix: the (manual) building of banks was always rejected.
rubidium
parents:
7712
diff
changeset
|
1244 |
if (CmdFailed(DoCommand(cur_tile, 0, 0, 0, CMD_LANDSCAPE_CLEAR))) return false; |
e6785e8fec08
(svn r10506) -Fix: the (manual) building of banks was always rejected.
rubidium
parents:
7712
diff
changeset
|
1245 |
} else if ((ind_behav & INDUSTRYBEH_ONLY_NEARTOWN) == 0 || !IsTileType(cur_tile, MP_HOUSE)) { |
e6785e8fec08
(svn r10506) -Fix: the (manual) building of banks was always rejected.
rubidium
parents:
7712
diff
changeset
|
1246 |
if (CmdFailed(DoCommand(cur_tile, 0, 0, DC_AUTO, CMD_LANDSCAPE_CLEAR))) return false; |
0 | 1247 |
} |
1248 |
} |
|
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
1249 |
} while ((++it)->ti.x != -0x80); |
0 | 1250 |
|
8159
7a36d78b2343
(svn r11194) -Fix: industries with not all tiles custom slope checked (but at least one) would be build on wrongly sloped tiles.
rubidium
parents:
8158
diff
changeset
|
1251 |
if (custom_shape_check != NULL) *custom_shape_check = custom_shape; |
7a36d78b2343
(svn r11194) -Fix: industries with not all tiles custom slope checked (but at least one) would be build on wrongly sloped tiles.
rubidium
parents:
8158
diff
changeset
|
1252 |
|
7a36d78b2343
(svn r11194) -Fix: industries with not all tiles custom slope checked (but at least one) would be build on wrongly sloped tiles.
rubidium
parents:
8158
diff
changeset
|
1253 |
/* It is almost impossible to have a fully flat land in TG, so what we |
7a36d78b2343
(svn r11194) -Fix: industries with not all tiles custom slope checked (but at least one) would be build on wrongly sloped tiles.
rubidium
parents:
8158
diff
changeset
|
1254 |
* do is that we check if we can make the land flat later on. See |
7a36d78b2343
(svn r11194) -Fix: industries with not all tiles custom slope checked (but at least one) would be build on wrongly sloped tiles.
rubidium
parents:
8158
diff
changeset
|
1255 |
* CheckIfCanLevelIndustryPlatform(). */ |
7a36d78b2343
(svn r11194) -Fix: industries with not all tiles custom slope checked (but at least one) would be build on wrongly sloped tiles.
rubidium
parents:
8158
diff
changeset
|
1256 |
return !refused_slope || (_patches.land_generator == LG_TERRAGENESIS && _generating_world && !custom_shape); |
0 | 1257 |
} |
1258 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1259 |
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
|
1260 |
{ |
6886
742e1d75f442
(svn r9520) -Codechange: Add the notion of Industry behaviour. It means what an industry can do (plant fields, cut trees, do not change production), what can be done to it (disasters like mine subsidence, jet/chopper attack), when it can be built etc...
belugas
parents:
6683
diff
changeset
|
1261 |
if ((GetIndustrySpec(type)->behaviour & INDUSTRYBEH_TOWN1200_MORE) && t->population < 1200) { |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1262 |
_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
|
1263 |
return false; |
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 |
|
6886
742e1d75f442
(svn r9520) -Codechange: Add the notion of Industry behaviour. It means what an industry can do (plant fields, cut trees, do not change production), what can be done to it (disasters like mine subsidence, jet/chopper attack), when it can be built etc...
belugas
parents:
6683
diff
changeset
|
1266 |
if ((GetIndustrySpec(type)->behaviour & INDUSTRYBEH_ONLY_NEARTOWN) && DistanceMax(t->xy, tile) > 9) { |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1267 |
_error_message = STR_0239_SITE_UNSUITABLE; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1268 |
return false; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1269 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1270 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1271 |
return true; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1272 |
} |
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 |
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
|
1275 |
{ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1276 |
int size_x, size_y; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1277 |
uint curh; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1278 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1279 |
size_x = 2; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1280 |
size_y = 2; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1281 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1282 |
/* 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
|
1283 |
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
|
1284 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1285 |
tile += TileDiffXY(-1, -1); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1286 |
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
|
1287 |
curh = TileHeight(tile_walk); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1288 |
/* Is the tile clear? */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1289 |
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
|
1290 |
return false; |
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 |
/* Don't allow too big of a change if this is the sub-tile check */ |
8466
9ce95e16f9f9
(svn r11526) -Codechange: Rename the function delta fitting to the naming style
skidd13
parents:
8463
diff
changeset
|
1293 |
if (internal != 0 && Delta(curh, height) > 1) return false; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1294 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1295 |
/* 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
|
1296 |
* 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
|
1297 |
* 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
|
1298 |
if (internal == 0 && curh != height) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1299 |
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
|
1300 |
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, 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 |
return true; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1305 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1306 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1307 |
/** |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1308 |
* 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
|
1309 |
* damaging the surroundings too much. |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1310 |
*/ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1311 |
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
|
1312 |
{ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1313 |
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
|
1314 |
int max_x = 0; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1315 |
int max_y = 0; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1316 |
TileIndex cur_tile; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1317 |
uint size_x, size_y; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1318 |
uint h, curh; |
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 |
/* 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
|
1321 |
do { |
8125
df9b65517e19
(svn r11160) -Fix: A gfx of 0xFF does not count when it's time to establish the size of the industry.
belugas
parents:
8111
diff
changeset
|
1322 |
if (it->gfx == 0xFF) continue; // FF been a marquer for a check on clear water, skip it |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1323 |
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
|
1324 |
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
|
1325 |
} while ((++it)->ti.x != MKEND); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1326 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1327 |
/* Remember level height */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1328 |
h = TileHeight(tile); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1329 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1330 |
/* 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
|
1331 |
* 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
|
1332 |
cur_tile = tile + TileDiffXY(-1, -1); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1333 |
size_x = max_x + 4; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1334 |
size_y = max_y + 4; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1335 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1336 |
/* 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
|
1337 |
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
|
1338 |
|
8136
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1339 |
/* _current_player is OWNER_NONE for randomly generated industries and in editor, or the player who funded or prospected the industry. |
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1340 |
* Perform terraforming as OWNER_TOWN to disable autoslope. */ |
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1341 |
PlayerID old_player = _current_player; |
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1342 |
_current_player = OWNER_TOWN; |
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1343 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1344 |
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
|
1345 |
curh = TileHeight(tile_walk); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1346 |
if (curh != h) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1347 |
/* 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
|
1348 |
* damaging the surroundings too much. */ |
8136
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1349 |
if (!CheckCanTerraformSurroundingTiles(tile_walk, h, 0)) { |
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1350 |
_current_player = old_player; |
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1351 |
return false; |
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1352 |
} |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1353 |
/* 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
|
1354 |
* What is missing, is if the difference in height is more than 1.. */ |
8136
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1355 |
if (CmdFailed(DoCommand(tile_walk, SLOPE_N, (curh > h) ? 0 : 1, flags & ~DC_EXEC, CMD_TERRAFORM_LAND))) { |
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1356 |
_current_player = old_player; |
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1357 |
return false; |
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1358 |
} |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1359 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1360 |
} 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
|
1361 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1362 |
if (flags & DC_EXEC) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1363 |
/* Terraform the land under the industry */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1364 |
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
|
1365 |
curh = TileHeight(tile_walk); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1366 |
while (curh != h) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1367 |
/* 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
|
1368 |
* 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
|
1369 |
* a nice assert if they don't match ;) */ |
7976
5d93386b748b
(svn r10991) -Codechange: add documentation, enumification and some code simplifications to the terraforming code. Patch by frosch.
rubidium
parents:
7969
diff
changeset
|
1370 |
DoCommand(tile_walk, SLOPE_N, (curh > h) ? 0 : 1, flags, CMD_TERRAFORM_LAND); |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1371 |
curh += (curh > h) ? -1 : 1; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1372 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1373 |
} 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
|
1374 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1375 |
|
8136
d1a4486be2fd
(svn r11171) -Fix [FS#1257]: disable autoslope for automatically changed stuff (like towns and industries) and enable it in the scenario editor. Patch by frosch.
rubidium
parents:
8133
diff
changeset
|
1376 |
_current_player = old_player; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1377 |
return true; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1378 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1379 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1380 |
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
1381 |
static bool CheckIfTooCloseToIndustry(TileIndex tile, int type) |
0 | 1382 |
{ |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1383 |
const IndustrySpec *indspec = GetIndustrySpec(type); |
3662
e9e1533c758b
(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).
belugas
parents:
3661
diff
changeset
|
1384 |
const Industry *i; |
0 | 1385 |
|
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1386 |
/* 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
|
1387 |
if (_patches.same_industry_close && indspec->accepts_cargo[0] == CT_INVALID) |
0 | 1388 |
return true; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1389 |
|
830
8114845804c9
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
817
diff
changeset
|
1390 |
FOR_ALL_INDUSTRIES(i) { |
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1391 |
/* 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
|
1392 |
if (DistanceMax(tile, i->xy) <= 14 && |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1393 |
indspec->accepts_cargo[0] != CT_INVALID && |
8141
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
1394 |
indspec->accepts_cargo[0] == i->accepts_cargo[0] && ( |
2639 | 1395 |
_game_mode != GM_EDITOR || |
1396 |
!_patches.same_industry_close || |
|
1397 |
!_patches.multiple_industry_per_town |
|
1398 |
)) { |
|
1399 |
_error_message = STR_INDUSTRY_TOO_CLOSE; |
|
1400 |
return false; |
|
1401 |
} |
|
0 | 1402 |
|
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1403 |
/* 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
|
1404 |
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
|
1405 |
DistanceMax(tile, i->xy) <= 14) { |
0 | 1406 |
_error_message = STR_INDUSTRY_TOO_CLOSE; |
1407 |
return false; |
|
1408 |
} |
|
1409 |
} |
|
1410 |
return true; |
|
1411 |
} |
|
1412 |
||
7941
ddf9d11e6df8
(svn r10903) -Feature: [NewGRF] Add support for variable 44 of Variational Action 2 for Industries
belugas
parents:
7916
diff
changeset
|
1413 |
static void DoCreateNewIndustry(Industry *i, TileIndex tile, int type, const IndustryTileTable *it, byte layout, const Town *t, Owner owner) |
0 | 1414 |
{ |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1415 |
const IndustrySpec *indspec = GetIndustrySpec(type); |
0 | 1416 |
uint32 r; |
8142
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1417 |
uint j; |
0 | 1418 |
|
1419 |
i->xy = tile; |
|
1420 |
i->width = i->height = 0; |
|
1421 |
i->type = type; |
|
7320
052da893fbd9
(svn r10063) -Codechange: Change VARDEF for extern
belugas
parents:
7315
diff
changeset
|
1422 |
IncIndustryTypeCount(type); |
0 | 1423 |
|
8141
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
1424 |
i->produced_cargo[0] = indspec->produced_cargo[0]; |
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
1425 |
i->produced_cargo[1] = indspec->produced_cargo[1]; |
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
1426 |
i->accepts_cargo[0] = indspec->accepts_cargo[0]; |
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
1427 |
i->accepts_cargo[1] = indspec->accepts_cargo[1]; |
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
1428 |
i->accepts_cargo[2] = indspec->accepts_cargo[2]; |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1429 |
i->production_rate[0] = indspec->production_rate[0]; |
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1430 |
i->production_rate[1] = indspec->production_rate[1]; |
0 | 1431 |
|
8443
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
1432 |
/* don't use smooth economy for industries using production related callbacks */ |
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
1433 |
if (_patches.smooth_economy && |
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
1434 |
!(HasBit(indspec->callback_flags, CBM_IND_PRODUCTION_256_TICKS) || HasBit(indspec->callback_flags, CBM_IND_PRODUCTION_CARGO_ARRIVAL)) && // production callbacks |
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
1435 |
!(HasBit(indspec->callback_flags, CBM_IND_MONTHLYPROD_CHANGE) || HasBit(indspec->callback_flags, CBM_IND_PRODUCTION_CHANGE)) // production change callbacks |
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
1436 |
) { |
0 | 1437 |
i->production_rate[0] = min((RandomRange(256) + 128) * i->production_rate[0] >> 8 , 255); |
1438 |
i->production_rate[1] = min((RandomRange(256) + 128) * i->production_rate[1] >> 8 , 255); |
|
1439 |
} |
|
1440 |
||
1441 |
i->town = t; |
|
1442 |
i->owner = owner; |
|
1443 |
||
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
|
1444 |
r = Random(); |
8358
79bdf95a862c
(svn r11412) -Fix (r11403): animation was not turned on properly.
rubidium
parents:
8356
diff
changeset
|
1445 |
i->random_color = GB(r, 0, 4); |
79bdf95a862c
(svn r11412) -Fix (r11403): animation was not turned on properly.
rubidium
parents:
8356
diff
changeset
|
1446 |
i->counter = GB(r, 4, 12); |
79bdf95a862c
(svn r11412) -Fix (r11403): animation was not turned on properly.
rubidium
parents:
8356
diff
changeset
|
1447 |
i->random = GB(r, 16, 16); |
7661
40c7a63ad9a1
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7647
diff
changeset
|
1448 |
i->produced_cargo_waiting[0] = 0; |
40c7a63ad9a1
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7647
diff
changeset
|
1449 |
i->produced_cargo_waiting[1] = 0; |
40c7a63ad9a1
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7647
diff
changeset
|
1450 |
i->incoming_cargo_waiting[0] = 0; |
40c7a63ad9a1
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7647
diff
changeset
|
1451 |
i->incoming_cargo_waiting[1] = 0; |
40c7a63ad9a1
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7647
diff
changeset
|
1452 |
i->incoming_cargo_waiting[2] = 0; |
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1453 |
i->this_month_production[0] = 0; |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1454 |
i->this_month_production[1] = 0; |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1455 |
i->this_month_transported[0] = 0; |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1456 |
i->this_month_transported[1] = 0; |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1457 |
i->last_month_pct_transported[0] = 0; |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1458 |
i->last_month_pct_transported[1] = 0; |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1459 |
i->last_month_transported[0] = 0; |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1460 |
i->last_month_transported[1] = 0; |
0 | 1461 |
i->was_cargo_delivered = false; |
4329
9759d5c52010
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4328
diff
changeset
|
1462 |
i->last_prod_year = _cur_year; |
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1463 |
i->last_month_production[0] = i->production_rate[0] * 8; |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1464 |
i->last_month_production[1] = i->production_rate[1] * 8; |
7682
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
1465 |
i->founder = _current_player; |
8142
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1466 |
|
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1467 |
if (HasBit(indspec->callback_flags, CBM_IND_DECIDE_COLOUR)) { |
8146
fae08d49a223
(svn r11181) -Codechange: add support for newgrf callback 14A (Belugas)
glx
parents:
8142
diff
changeset
|
1468 |
uint16 res = GetIndustryCallback(CBID_INDUSTRY_DECIDE_COLOUR, 0, 0, i, type, INVALID_TILE); |
fae08d49a223
(svn r11181) -Codechange: add support for newgrf callback 14A (Belugas)
glx
parents:
8142
diff
changeset
|
1469 |
if (res != CALLBACK_FAILED) i->random_color = GB(res, 0, 4); |
fae08d49a223
(svn r11181) -Codechange: add support for newgrf callback 14A (Belugas)
glx
parents:
8142
diff
changeset
|
1470 |
} |
fae08d49a223
(svn r11181) -Codechange: add support for newgrf callback 14A (Belugas)
glx
parents:
8142
diff
changeset
|
1471 |
|
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1472 |
if (HasBit(indspec->callback_flags, CBM_IND_INPUT_CARGO_TYPES)) { |
8142
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1473 |
for (j = 0; j < lengthof(i->accepts_cargo); j++) i->accepts_cargo[j] = CT_INVALID; |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1474 |
for (j = 0; j < lengthof(i->accepts_cargo); j++) { |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1475 |
uint16 res = GetIndustryCallback(CBID_INDUSTRY_INPUT_CARGO_TYPES, j, 0, i, type, INVALID_TILE); |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1476 |
if (res == CALLBACK_FAILED || GB(res, 0, 8) == CT_INVALID) break; |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1477 |
i->accepts_cargo[j] = GetCargoTranslation(GB(res, 0, 8), indspec->grf_prop.grffile); |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1478 |
} |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1479 |
} |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1480 |
|
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1481 |
if (HasBit(indspec->callback_flags, CBM_IND_OUTPUT_CARGO_TYPES)) { |
8142
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1482 |
for (j = 0; j < lengthof(i->produced_cargo); j++) i->produced_cargo[j] = CT_INVALID; |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1483 |
for (j = 0; j < lengthof(i->produced_cargo); j++) { |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1484 |
uint16 res = GetIndustryCallback(CBID_INDUSTRY_OUTPUT_CARGO_TYPES, j, 0, i, type, INVALID_TILE); |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1485 |
if (res == CALLBACK_FAILED || GB(res, 0, 8) == CT_INVALID) break; |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1486 |
i->produced_cargo[j] = GetCargoTranslation(GB(res, 0, 8), indspec->grf_prop.grffile); |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1487 |
} |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1488 |
} |
aaac2a5f116b
(svn r11177) -Codechange: add support for newgrf callbacks 14B and 14C
glx
parents:
8141
diff
changeset
|
1489 |
|
7682
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
1490 |
i->construction_date = _date; |
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
1491 |
i->construction_type = (_game_mode == GM_EDITOR) ? ICT_SCENARIO_EDITOR : |
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
1492 |
(_generating_world ? ICT_MAP_GENERATION : ICT_NORMAL_GAMEPLAY); |
0 | 1493 |
|
7941
ddf9d11e6df8
(svn r10903) -Feature: [NewGRF] Add support for variable 44 of Variational Action 2 for Industries
belugas
parents:
7916
diff
changeset
|
1494 |
/* Adding 1 here makes it conform to specs of var44 of varaction2 for industries |
ddf9d11e6df8
(svn r10903) -Feature: [NewGRF] Add support for variable 44 of Variational Action 2 for Industries
belugas
parents:
7916
diff
changeset
|
1495 |
* 0 = created prior of newindustries |
ddf9d11e6df8
(svn r10903) -Feature: [NewGRF] Add support for variable 44 of Variational Action 2 for Industries
belugas
parents:
7916
diff
changeset
|
1496 |
* else, chosen layout + 1 */ |
ddf9d11e6df8
(svn r10903) -Feature: [NewGRF] Add support for variable 44 of Variational Action 2 for Industries
belugas
parents:
7916
diff
changeset
|
1497 |
i->selected_layout = layout + 1; |
ddf9d11e6df8
(svn r10903) -Feature: [NewGRF] Add support for variable 44 of Variational Action 2 for Industries
belugas
parents:
7916
diff
changeset
|
1498 |
|
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1499 |
if (!_generating_world) i->last_month_production[0] = i->last_month_production[1] = 0; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1500 |
|
0 | 1501 |
i->prod_level = 0x10; |
1502 |
||
1503 |
do { |
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1891
diff
changeset
|
1504 |
TileIndex cur_tile = tile + ToTileIndexDiff(it->ti); |
0 | 1505 |
|
7969
9050701304bd
(svn r10980) -Fix [FS#1158] : This will hopefully fix the case of an assert that happens when an industry uses a special gfx index (tile spec 0xFF). This 0xFF is the sentinel of a special check done for oil rigs, where water need to be around, but no tile will be constructed on it.
belugas
parents:
7963
diff
changeset
|
1506 |
if (it->gfx != GFX_WATERTILE_SPECIALCHECK) { |
0 | 1507 |
byte size; |
1508 |
||
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
1509 |
size = it->ti.x; |
0 | 1510 |
if (size > i->width) i->width = size; |
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
1511 |
size = it->ti.y; |
0 | 1512 |
if (size > i->height)i->height = size; |
1513 |
||
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
|
1514 |
DoCommand(cur_tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); |
0 | 1515 |
|
3440 | 1516 |
MakeIndustry(cur_tile, i->index, it->gfx); |
8349
011e0ee04e43
(svn r11403) -Fix: NewIndustries GRF assume that tiles are already animated during construction.
rubidium
parents:
8348
diff
changeset
|
1517 |
|
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
1518 |
if (_generating_world) { |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
1519 |
SetIndustryConstructionCounter(cur_tile, 3); |
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
1520 |
SetIndustryConstructionStage(cur_tile, 2); |
8358
79bdf95a862c
(svn r11412) -Fix (r11403): animation was not turned on properly.
rubidium
parents:
8356
diff
changeset
|
1521 |
} |
79bdf95a862c
(svn r11412) -Fix (r11403): animation was not turned on properly.
rubidium
parents:
8356
diff
changeset
|
1522 |
if (it->gfx >= NEW_INDUSTRYTILEOFFSET) { |
8349
011e0ee04e43
(svn r11403) -Fix: NewIndustries GRF assume that tiles are already animated during construction.
rubidium
parents:
8348
diff
changeset
|
1523 |
/* New industry */ |
011e0ee04e43
(svn r11403) -Fix: NewIndustries GRF assume that tiles are already animated during construction.
rubidium
parents:
8348
diff
changeset
|
1524 |
const IndustryTileSpec *its = GetIndustryTileSpec(it->gfx); |
011e0ee04e43
(svn r11403) -Fix: NewIndustries GRF assume that tiles are already animated during construction.
rubidium
parents:
8348
diff
changeset
|
1525 |
if (its->animation_info != 0xFFFF) AddAnimatedTile(cur_tile); |
5686
03c3d3b3e7eb
(svn r7641) -Codechange: remove the last direct map accesses from industry_cmd.
rubidium
parents:
5685
diff
changeset
|
1526 |
} |
0 | 1527 |
} |
909
81bc9ef93f50
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents:
889
diff
changeset
|
1528 |
} while ((++it)->ti.x != -0x80); |
0 | 1529 |
|
1530 |
i->width++; |
|
1531 |
i->height++; |
|
1532 |
||
6886
742e1d75f442
(svn r9520) -Codechange: Add the notion of Industry behaviour. It means what an industry can do (plant fields, cut trees, do not change production), what can be done to it (disasters like mine subsidence, jet/chopper attack), when it can be built etc...
belugas
parents:
6683
diff
changeset
|
1533 |
if (GetIndustrySpec(i->type)->behaviour & INDUSTRYBEH_PLANT_ON_BUILT) { |
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
|
1534 |
for (j = 0; j != 50; j++) PlantRandomFarmField(i); |
0 | 1535 |
} |
1536 |
_industry_sort_dirty = true; |
|
1537 |
InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0); |
|
1538 |
} |
|
1539 |
||
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1540 |
/** Helper function for Build/Fund an industry |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1541 |
* @param tile tile where industry is built |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1542 |
* @param type of industry to build |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1543 |
* @param flags of operations to conduct |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1544 |
* @param indspec pointer to industry specifications |
7703
bc4b879b7324
(svn r10485) -Codechange: add a callback mechanism to determine whether building an industry is allowed at a given location.
rubidium
parents:
7701
diff
changeset
|
1545 |
* @param itspec_index the index of the itsepc to build/fund |
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1546 |
* @return the pointer of the newly created industry, or NULL if it failed |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1547 |
*/ |
7703
bc4b879b7324
(svn r10485) -Codechange: add a callback mechanism to determine whether building an industry is allowed at a given location.
rubidium
parents:
7701
diff
changeset
|
1548 |
static Industry *CreateNewIndustryHelper(TileIndex tile, IndustryType type, uint32 flags, const IndustrySpec *indspec, uint itspec_index) |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1549 |
{ |
7703
bc4b879b7324
(svn r10485) -Codechange: add a callback mechanism to determine whether building an industry is allowed at a given location.
rubidium
parents:
7701
diff
changeset
|
1550 |
const IndustryTileTable *it = indspec->table[itspec_index]; |
7708
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1551 |
bool custom_shape_check = false; |
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1552 |
|
8158
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1553 |
if (!CheckIfIndustryTilesAreFree(tile, it, itspec_index, type, &custom_shape_check)) return NULL; |
7708
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1554 |
|
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1555 |
if (HasBit(GetIndustrySpec(type)->callback_flags, CBM_IND_LOCATION)) { |
7703
bc4b879b7324
(svn r10485) -Codechange: add a callback mechanism to determine whether building an industry is allowed at a given location.
rubidium
parents:
7701
diff
changeset
|
1556 |
if (!CheckIfCallBackAllowsCreation(tile, type, itspec_index)) return NULL; |
7708
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1557 |
} else { |
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1558 |
if (!_check_new_industry_procs[indspec->check_proc](tile)) return NULL; |
7703
bc4b879b7324
(svn r10485) -Codechange: add a callback mechanism to determine whether building an industry is allowed at a given location.
rubidium
parents:
7701
diff
changeset
|
1559 |
} |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1560 |
|
7708
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1561 |
if (!custom_shape_check && _patches.land_generator == LG_TERRAGENESIS && _generating_world && !CheckIfCanLevelIndustryPlatform(tile, 0, it, type)) return NULL; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1562 |
if (!CheckIfTooCloseToIndustry(tile, type)) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1563 |
|
7703
bc4b879b7324
(svn r10485) -Codechange: add a callback mechanism to determine whether building an industry is allowed at a given location.
rubidium
parents:
7701
diff
changeset
|
1564 |
const Town *t = CheckMultipleIndustryInTown(tile, type); |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1565 |
if (t == NULL) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1566 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1567 |
if (!CheckIfIndustryIsAllowed(tile, type, t)) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1568 |
if (!CheckSuitableIndustryPos(tile)) return NULL; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1569 |
|
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
1570 |
Industry *i = new Industry(tile); |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1571 |
if (i == NULL) return NULL; |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
1572 |
AutoPtrT<Industry> i_auto_delete = i; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1573 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1574 |
if (flags & DC_EXEC) { |
7708
595630b38fbf
(svn r10490) -Codechange: add support for industries on non-flat surfaces.
rubidium
parents:
7703
diff
changeset
|
1575 |
if (!custom_shape_check) CheckIfCanLevelIndustryPlatform(tile, DC_EXEC, it, type); |
7941
ddf9d11e6df8
(svn r10903) -Feature: [NewGRF] Add support for variable 44 of Variational Action 2 for Industries
belugas
parents:
7916
diff
changeset
|
1576 |
DoCreateNewIndustry(i, tile, type, it, itspec_index, t, OWNER_NONE); |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
1577 |
i_auto_delete.Detach(); |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1578 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1579 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1580 |
return i; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1581 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1582 |
|
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
|
1583 |
/** 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
|
1584 |
* @param tile tile where industry is built |
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1585 |
* @param flags of operations to conduct |
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1586 |
* @param p1 industry type see build_industry.h and see industry.h |
8302
df1671669a80
(svn r11356) -Fix (r11305): funding industries in MP game was causing desync
glx
parents:
8295
diff
changeset
|
1587 |
* @param p2 first layout to try |
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1588 |
* @return index of the newly create industry, or CMD_ERROR if it failed |
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
|
1589 |
*/ |
7439
0c0e2945c890
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
7406
diff
changeset
|
1590 |
CommandCost CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1591 |
{ |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1592 |
const IndustrySpec *indspec; |
0 | 1593 |
|
1594 |
SET_EXPENSES_TYPE(EXPENSES_OTHER); |
|
1595 |
||
4965
9d4ad0851fde
(svn r6965) -CodeChange : Add a climate bitmask member to IndutrySpec.
belugas
parents:
4942
diff
changeset
|
1596 |
indspec = GetIndustrySpec(p1); |
2639 | 1597 |
|
4965
9d4ad0851fde
(svn r6965) -CodeChange : Add a climate bitmask member to IndutrySpec.
belugas
parents:
4942
diff
changeset
|
1598 |
/* Check if the to-be built/founded industry is available for this climate. */ |
7244
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1599 |
if (!indspec->enabled) { |
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1600 |
return CMD_ERROR; |
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1601 |
} |
0 | 1602 |
|
2638
0c9b00251fce
(svn r3180) Replace some magic numbers by symbolic names
tron
parents:
2637
diff
changeset
|
1603 |
/* If the patch for raw-material industries is not on, you cannot build raw-material industries. |
7681
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
1604 |
* Raw material industries are industries that do not accept cargo (at least for now) */ |
7703
bc4b879b7324
(svn r10485) -Codechange: add a callback mechanism to determine whether building an industry is allowed at a given location.
rubidium
parents:
7701
diff
changeset
|
1605 |
if (_game_mode != GM_EDITOR && _patches.raw_industry_construction == 0 && indspec->IsRawIndustry()) { |
2638
0c9b00251fce
(svn r3180) Replace some magic numbers by symbolic names
tron
parents:
2637
diff
changeset
|
1606 |
return CMD_ERROR; |
0c9b00251fce
(svn r3180) Replace some magic numbers by symbolic names
tron
parents:
2637
diff
changeset
|
1607 |
} |
0 | 1608 |
|
7703
bc4b879b7324
(svn r10485) -Codechange: add a callback mechanism to determine whether building an industry is allowed at a given location.
rubidium
parents:
7701
diff
changeset
|
1609 |
if (_game_mode != GM_EDITOR && _patches.raw_industry_construction == 2 && indspec->IsRawIndustry()) { |
7673
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1610 |
if (flags & DC_EXEC) { |
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1611 |
/* Prospecting has a chance to fail, however we cannot guarantee that something can |
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1612 |
* be built on the map, so the chance gets lower when the map is fuller, but there |
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1613 |
* is nothing we can really do about that. */ |
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1614 |
if (Random() <= indspec->prospecting_chance) { |
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1615 |
for (int i = 0; i < 5000; i++) { |
8256
4f95ba635f0b
(svn r11305) -Codechange: randomise layout when building an industry ingame
glx
parents:
8254
diff
changeset
|
1616 |
const Industry *ind = CreateNewIndustryHelper(RandomTile(), p1, flags, indspec, RandomRange(indspec->num_table)); |
7699
c750f7b360b9
(svn r10481) -Codechange: Show a news message with the new industry when primary industry prospecting succeeds.
maedhros
parents:
7695
diff
changeset
|
1617 |
if (ind != NULL) { |
c750f7b360b9
(svn r10481) -Codechange: Show a news message with the new industry when primary industry prospecting succeeds.
maedhros
parents:
7695
diff
changeset
|
1618 |
SetDParam(0, indspec->name); |
8251
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1619 |
if (indspec->new_industry_text > STR_LAST_STRINGID) { |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1620 |
SetDParam(1, STR_TOWN); |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1621 |
SetDParam(2, ind->town->index); |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1622 |
} else { |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1623 |
SetDParam(1, ind->town->index); |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1624 |
} |
7699
c750f7b360b9
(svn r10481) -Codechange: Show a news message with the new industry when primary industry prospecting succeeds.
maedhros
parents:
7695
diff
changeset
|
1625 |
AddNewsItem(indspec->new_industry_text, |
c750f7b360b9
(svn r10481) -Codechange: Show a news message with the new industry when primary industry prospecting succeeds.
maedhros
parents:
7695
diff
changeset
|
1626 |
NEWS_FLAGS(NM_THIN, NF_VIEWPORT | NF_TILE, NT_OPENCLOSE, 0), ind->xy, 0); |
c750f7b360b9
(svn r10481) -Codechange: Show a news message with the new industry when primary industry prospecting succeeds.
maedhros
parents:
7695
diff
changeset
|
1627 |
break; |
c750f7b360b9
(svn r10481) -Codechange: Show a news message with the new industry when primary industry prospecting succeeds.
maedhros
parents:
7695
diff
changeset
|
1628 |
} |
7673
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1629 |
} |
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1630 |
} |
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1631 |
} |
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1632 |
} else { |
8256
4f95ba635f0b
(svn r11305) -Codechange: randomise layout when building an industry ingame
glx
parents:
8254
diff
changeset
|
1633 |
int count = indspec->num_table; |
4f95ba635f0b
(svn r11305) -Codechange: randomise layout when building an industry ingame
glx
parents:
8254
diff
changeset
|
1634 |
const IndustryTileTable * const *itt = indspec->table; |
8418
b49fc6be1ab9
(svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents:
8387
diff
changeset
|
1635 |
int num = Clamp(p2, 0, count - 1); |
0 | 1636 |
|
8244
e23cac10e7fd
(svn r11285) -Fix: 'site unsuitable' was always shown instead specified message when trying to build industry ingame (Csaboka)
glx
parents:
8235
diff
changeset
|
1637 |
_error_message = STR_0239_SITE_UNSUITABLE; |
7673
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1638 |
do { |
8256
4f95ba635f0b
(svn r11305) -Codechange: randomise layout when building an industry ingame
glx
parents:
8254
diff
changeset
|
1639 |
if (--count < 0) return CMD_ERROR; |
4f95ba635f0b
(svn r11305) -Codechange: randomise layout when building an industry ingame
glx
parents:
8254
diff
changeset
|
1640 |
if (--num < 0) num = indspec->num_table - 1; |
8158
84c773075796
(svn r11193) -Fix: be more compliant with the specifications of callback #2F (and undocumented side effects in TTDP in corner cases).
rubidium
parents:
8151
diff
changeset
|
1641 |
} while (!CheckIfIndustryTilesAreFree(tile, itt[num], num, p1)); |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1642 |
|
7703
bc4b879b7324
(svn r10485) -Codechange: add a callback mechanism to determine whether building an industry is allowed at a given location.
rubidium
parents:
7701
diff
changeset
|
1643 |
if (CreateNewIndustryHelper(tile, p1, flags, indspec, num) == NULL) return CMD_ERROR; |
7673
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1644 |
} |
3ab9344bd532
(svn r10451) -Add: support for "prospecting" raw industries, i.e. you pay an amount of money and then it might (with a given chance) build a raw industry somewhere on the map.
rubidium
parents:
7664
diff
changeset
|
1645 |
|
7681
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
1646 |
return CommandCost(indspec->GetConstructionCost()); |
0 | 1647 |
} |
1648 |
||
1649 |
||
3538
3eb71c726341
(svn r4399) CodeChange : Add and make use of [G|S]etIndustryAnimationLoop accessors.
belugas
parents:
3499
diff
changeset
|
1650 |
Industry *CreateNewIndustry(TileIndex tile, IndustryType type) |
0 | 1651 |
{ |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1652 |
const IndustrySpec *indspec = GetIndustrySpec(type); |
0 | 1653 |
|
7703
bc4b879b7324
(svn r10485) -Codechange: add a callback mechanism to determine whether building an industry is allowed at a given location.
rubidium
parents:
7701
diff
changeset
|
1654 |
return CreateNewIndustryHelper(tile, type, DC_EXEC, indspec, RandomRange(indspec->num_table)); |
0 | 1655 |
} |
1656 |
||
7834
00abd0f1ea03
(svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then.
belugas
parents:
7833
diff
changeset
|
1657 |
enum { |
00abd0f1ea03
(svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then.
belugas
parents:
7833
diff
changeset
|
1658 |
NB_NUMOFINDUSTRY = 11, |
00abd0f1ea03
(svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then.
belugas
parents:
7833
diff
changeset
|
1659 |
NB_DIFFICULTY_LEVEL = 5, |
00abd0f1ea03
(svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then.
belugas
parents:
7833
diff
changeset
|
1660 |
}; |
00abd0f1ea03
(svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then.
belugas
parents:
7833
diff
changeset
|
1661 |
|
00abd0f1ea03
(svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then.
belugas
parents:
7833
diff
changeset
|
1662 |
static const byte _numof_industry_table[NB_DIFFICULTY_LEVEL][NB_NUMOFINDUSTRY] = { |
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
1663 |
/* difficulty settings for number of industries */ |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1664 |
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, //none |
7056
b4f146586c97
(svn r9762) -Feature: Two new difficulty settings : Very low number of towns and very low number of industries
belugas
parents:
7015
diff
changeset
|
1665 |
{0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, //very low |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1666 |
{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
|
1667 |
{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
|
1668 |
{0, 2, 3, 4, 6, 7, 8, 9, 10, 10, 10}, //high |
0 | 1669 |
}; |
1670 |
||
6938
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1671 |
/** This function is the one who really do the creation work |
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1672 |
* of random industries during game creation |
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1673 |
* @param type IndustryType of the desired industry |
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1674 |
* @param amount of industries that need to be built */ |
3669
8a3a5d008971
(svn r4584) CodeChange : Cleanup of industry_cmd (Step-3).
belugas
parents:
3663
diff
changeset
|
1675 |
static void PlaceInitialIndustry(IndustryType type, int amount) |
0 | 1676 |
{ |
7834
00abd0f1ea03
(svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then.
belugas
parents:
7833
diff
changeset
|
1677 |
/* We need to bypass the amount given in parameter if it exceeds the maximum dimension of the |
00abd0f1ea03
(svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then.
belugas
parents:
7833
diff
changeset
|
1678 |
* _numof_industry_table. newgrf can specify a big amount */ |
00abd0f1ea03
(svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then.
belugas
parents:
7833
diff
changeset
|
1679 |
int num = (amount > NB_NUMOFINDUSTRY) ? amount : _numof_industry_table[_opt.diff.number_industries][amount]; |
7253
18dca03d0c67
(svn r9992) -Codechange: Remove some hardcoded references to Industry IDs.
belugas
parents:
7245
diff
changeset
|
1680 |
const IndustrySpec *ind_spc = GetIndustrySpec(type); |
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
|
1681 |
|
6938
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1682 |
/* These are always placed next to the coastline, so we scale by the perimeter instead. */ |
7253
18dca03d0c67
(svn r9992) -Codechange: Remove some hardcoded references to Industry IDs.
belugas
parents:
7245
diff
changeset
|
1683 |
num = (ind_spc->check_proc == CHECK_REFINERY || ind_spc->check_proc == CHECK_OIL_RIG) ? ScaleByMapSize1D(num) : ScaleByMapSize(num); |
110
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
61
diff
changeset
|
1684 |
|
2639 | 1685 |
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
|
1686 |
PlayerID old_player = _current_player; |
266
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
1687 |
_current_player = OWNER_NONE; |
61
cd2827156f2a
(svn r62) - Added "None" as option for number of industries in difficulty settings
orudge
parents:
43
diff
changeset
|
1688 |
assert(num > 0); |
0 | 1689 |
|
1690 |
do { |
|
2639 | 1691 |
uint i; |
1692 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1693 |
IncreaseGeneratingWorldProgress(GWP_INDUSTRY); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1694 |
|
2639 | 1695 |
for (i = 0; i < 2000; i++) { |
1696 |
if (CreateNewIndustry(RandomTile(), type) != NULL) break; |
|
1697 |
} |
|
110
a22a6b07904b
(svn r111) -Fix: converted all linebreaks to UNIX-linebreak (\n)
truelight
parents:
61
diff
changeset
|
1698 |
} while (--num); |
266
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
1699 |
|
267 | 1700 |
_current_player = old_player; |
61
cd2827156f2a
(svn r62) - Added "None" as option for number of industries in difficulty settings
orudge
parents:
43
diff
changeset
|
1701 |
} |
0 | 1702 |
} |
1703 |
||
6938
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1704 |
/** This function will create ramdon industries during game creation. |
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1705 |
* It will scale the amount of industries by map size as well as difficulty level */ |
6573 | 1706 |
void GenerateIndustries() |
0 | 1707 |
{ |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1708 |
uint i = 0; |
6938
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1709 |
uint8 chance; |
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1710 |
IndustryType it; |
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1711 |
const IndustrySpec *ind_spc; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1712 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1713 |
/* Find the total amount of industries */ |
7757
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1714 |
if (_opt.diff.number_industries > 0) { |
7815
04deaeb181ab
(svn r10675) -Codechange: unhardcode the industry types used in several locations of the source code.
rubidium
parents:
7789
diff
changeset
|
1715 |
for (it = 0; it < NUM_INDUSTRYTYPES; it++) { |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1716 |
|
7757
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1717 |
ind_spc = GetIndustrySpec(it); |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1718 |
|
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1719 |
if (!CheckIfCallBackAllowsAvailability(it, IACT_MAPGENERATION)) { |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1720 |
ResetIndustryCreationProbility(it); |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1721 |
} |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1722 |
|
7244
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1723 |
chance = ind_spc->appear_creation[_opt.landscape]; |
7758 | 1724 |
if (ind_spc->enabled && chance > 0) { |
7244
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1725 |
/* once the chance of appearance is determind, it have to be scaled by |
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1726 |
* the difficulty level. The "chance" in question is more an index into |
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1727 |
* the _numof_industry_table,in fact */ |
7834
00abd0f1ea03
(svn r10701) -Codechange: Make sure to not use an out of bound index when the index is specified by a grf file. It has a different meaning then.
belugas
parents:
7833
diff
changeset
|
1728 |
int num = (chance > NB_NUMOFINDUSTRY) ? chance : _numof_industry_table[_opt.diff.number_industries][chance]; |
6938
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1729 |
|
7244
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1730 |
/* These are always placed next to the coastline, so we scale by the perimeter instead. */ |
7253
18dca03d0c67
(svn r9992) -Codechange: Remove some hardcoded references to Industry IDs.
belugas
parents:
7245
diff
changeset
|
1731 |
num = (ind_spc->check_proc == CHECK_REFINERY || ind_spc->check_proc == CHECK_OIL_RIG) ? ScaleByMapSize1D(num) : ScaleByMapSize(num); |
7244
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1732 |
i += num; |
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1733 |
} |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1734 |
} |
6938
37018cdc1ea3
(svn r9579) -Codechange: Cleanup of industry_cmd (Step-11). Use industry's spec appear_creation during random map creation.
belugas
parents:
6934
diff
changeset
|
1735 |
} |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1736 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4297
diff
changeset
|
1737 |
SetGeneratingWorldProgress(GWP_INDUSTRY, i); |
0 | 1738 |
|
7757
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1739 |
if (_opt.diff.number_industries > 0) { |
7815
04deaeb181ab
(svn r10675) -Codechange: unhardcode the industry types used in several locations of the source code.
rubidium
parents:
7789
diff
changeset
|
1740 |
for (it = 0; it < NUM_INDUSTRYTYPES; it++) { |
7757
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1741 |
/* Once the number of industries has been determined, let's really create them. |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1742 |
* The test for chance allows us to try create industries that are available only |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1743 |
* for this landscape. |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1744 |
* @todo : Do we really have to pass chance as un-scaled value, since we've already |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1745 |
* processed that scaling above? No, don't think so. Will find a way. */ |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1746 |
ind_spc = GetIndustrySpec(it); |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1747 |
if (ind_spc->enabled) { |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1748 |
chance = ind_spc->appear_creation[_opt.landscape]; |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1749 |
if (chance > 0) PlaceInitialIndustry(it, chance); |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1750 |
} |
7244
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7239
diff
changeset
|
1751 |
} |
7757
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1752 |
} |
0 | 1753 |
} |
1754 |
||
1755 |
static void UpdateIndustryStatistics(Industry *i) |
|
1756 |
{ |
|
1757 |
byte pct; |
|
6963 | 1758 |
bool refresh = false; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
1759 |
|
8141
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
1760 |
for (byte j = 0; j < lengthof(i->produced_cargo); j++) { |
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
1761 |
if (i->produced_cargo[j] != CT_INVALID) { |
7132
08abbae3073e
(svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead.
belugas
parents:
7056
diff
changeset
|
1762 |
pct = 0; |
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1763 |
if (i->this_month_production[j] != 0) { |
7132
08abbae3073e
(svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead.
belugas
parents:
7056
diff
changeset
|
1764 |
i->last_prod_year = _cur_year; |
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1765 |
pct = min(i->this_month_transported[j] * 256 / i->this_month_production[j], 255); |
7132
08abbae3073e
(svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead.
belugas
parents:
7056
diff
changeset
|
1766 |
} |
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1767 |
i->last_month_pct_transported[j] = pct; |
0 | 1768 |
|
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1769 |
i->last_month_production[j] = i->this_month_production[j]; |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1770 |
i->this_month_production[j] = 0; |
0 | 1771 |
|
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1772 |
i->last_month_transported[j] = i->this_month_transported[j]; |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
1773 |
i->this_month_transported[j] = 0; |
7132
08abbae3073e
(svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead.
belugas
parents:
7056
diff
changeset
|
1774 |
refresh = true; |
08abbae3073e
(svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead.
belugas
parents:
7056
diff
changeset
|
1775 |
} |
0 | 1776 |
} |
1777 |
||
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1778 |
if (refresh) InvalidateWindow(WC_INDUSTRY_VIEW, i->index); |
0 | 1779 |
} |
1780 |
||
6927
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1781 |
/** Simple helper that will collect data for the generation of industries */ |
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1782 |
struct ProbabilityHelper { |
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1783 |
uint16 prob; ///< probability |
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1784 |
IndustryType ind; ///< industry id correcponding |
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1785 |
}; |
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1786 |
|
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1787 |
/** |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1788 |
* Try to create a random industry, during gameplay |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1789 |
*/ |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1790 |
static void MaybeNewIndustry(void) |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1791 |
{ |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1792 |
Industry *ind; //will receive the industry's creation pointer |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1793 |
IndustryType rndtype, j; // Loop controlers |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1794 |
const IndustrySpec *ind_spc; |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1795 |
uint num = 0; |
6989
43b359b4cb86
(svn r9676) -Codechange: introduce NUM_INDUSTRYTYPES instead of IT_END.
belugas
parents:
6987
diff
changeset
|
1796 |
ProbabilityHelper cumulative_probs[NUM_INDUSTRYTYPES]; // probability collector |
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1797 |
uint16 probability_max = 0; |
0 | 1798 |
|
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1799 |
/* Generate a list of all possible industries that can be built. */ |
6989
43b359b4cb86
(svn r9676) -Codechange: introduce NUM_INDUSTRYTYPES instead of IT_END.
belugas
parents:
6987
diff
changeset
|
1800 |
for (j = 0; j < NUM_INDUSTRYTYPES; j++) { |
8319
434ce8c1e463
(svn r11373) -Fix [FS#1398]: do not even think about building disabled industries.
rubidium
parents:
8317
diff
changeset
|
1801 |
ind_spc = GetIndustrySpec(j); |
434ce8c1e463
(svn r11373) -Fix [FS#1398]: do not even think about building disabled industries.
rubidium
parents:
8317
diff
changeset
|
1802 |
byte chance = ind_spc->appear_ingame[_opt.landscape]; |
434ce8c1e463
(svn r11373) -Fix [FS#1398]: do not even think about building disabled industries.
rubidium
parents:
8317
diff
changeset
|
1803 |
|
434ce8c1e463
(svn r11373) -Fix [FS#1398]: do not even think about building disabled industries.
rubidium
parents:
8317
diff
changeset
|
1804 |
if (!ind_spc->enabled || chance == 0) continue; |
0 | 1805 |
|
7757
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1806 |
/* If there is no Callback CBID_INDUSTRY_AVAILABLE or if this one did anot failed, |
6335bd827212
(svn r10573) -Codechange: Use function CheckIfCallBackAllowsAvailability for random map generation as well as for ingame random industry creation
belugas
parents:
7725
diff
changeset
|
1807 |
* and if appearing chance for this landscape is above 0, this industry can be chosen */ |
8319
434ce8c1e463
(svn r11373) -Fix [FS#1398]: do not even think about building disabled industries.
rubidium
parents:
8317
diff
changeset
|
1808 |
if (CheckIfCallBackAllowsAvailability(j, IACT_RANDOMCREATION)) { |
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1809 |
probability_max += chance; |
6927
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1810 |
/* adds the result for this industry */ |
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1811 |
cumulative_probs[num].ind = j; |
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1812 |
cumulative_probs[num++].prob = probability_max; |
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1813 |
} |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1814 |
} |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1815 |
|
6927
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1816 |
/* Find a random type, with maximum being what has been evaluate above*/ |
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1817 |
rndtype = RandomRange(probability_max); |
6989
43b359b4cb86
(svn r9676) -Codechange: introduce NUM_INDUSTRYTYPES instead of IT_END.
belugas
parents:
6987
diff
changeset
|
1818 |
for (j = 0; j < NUM_INDUSTRYTYPES; j++) { |
6927
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1819 |
/* and choose the index of the industry that matches as close as possible this random type */ |
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1820 |
if (cumulative_probs[j].prob >= rndtype) break; |
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1821 |
} |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1822 |
|
6927
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1823 |
ind_spc = GetIndustrySpec(cumulative_probs[j].ind); |
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1824 |
/* Check if it is allowed */ |
6886
742e1d75f442
(svn r9520) -Codechange: Add the notion of Industry behaviour. It means what an industry can do (plant fields, cut trees, do not change production), what can be done to it (disasters like mine subsidence, jet/chopper attack), when it can be built etc...
belugas
parents:
6683
diff
changeset
|
1825 |
if ((ind_spc->behaviour & INDUSTRYBEH_BEFORE_1950) && _cur_year > 1950) return; |
742e1d75f442
(svn r9520) -Codechange: Add the notion of Industry behaviour. It means what an industry can do (plant fields, cut trees, do not change production), what can be done to it (disasters like mine subsidence, jet/chopper attack), when it can be built etc...
belugas
parents:
6683
diff
changeset
|
1826 |
if ((ind_spc->behaviour & INDUSTRYBEH_AFTER_1960) && _cur_year < 1960) return; |
0 | 1827 |
|
6927
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1828 |
/* try to create 2000 times this industry */ |
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1829 |
num = 2000; |
2639 | 1830 |
for (;;) { |
6927
0ed416264b17
(svn r9567) -Fix(9555, FS#718): The industry ID been collected was just an index in a out of phase array. Now, ensure that the ID will really be an IndustryType
belugas
parents:
6923
diff
changeset
|
1831 |
ind = CreateNewIndustry(RandomTile(), cumulative_probs[j].ind); |
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1832 |
if (ind != NULL) break; |
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
1833 |
if (--num == 0) return; |
0 | 1834 |
} |
1835 |
||
6592
fe9298ade0a8
(svn r9075) -Codechange: Cleanup of industry_cmd (Step-7). Small step that is. The new industry messages do not need a series of tests. Only one property to use.
belugas
parents:
6573
diff
changeset
|
1836 |
SetDParam(0, ind_spc->name); |
8251
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1837 |
if (ind_spc->new_industry_text > STR_LAST_STRINGID) { |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1838 |
SetDParam(1, STR_TOWN); |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1839 |
SetDParam(2, ind->town->index); |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1840 |
} else { |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1841 |
SetDParam(1, ind->town->index); |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
1842 |
} |
6592
fe9298ade0a8
(svn r9075) -Codechange: Cleanup of industry_cmd (Step-7). Small step that is. The new industry messages do not need a series of tests. Only one property to use.
belugas
parents:
6573
diff
changeset
|
1843 |
AddNewsItem(ind_spc->new_industry_text, |
6987
b0f13039bda2
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6964
diff
changeset
|
1844 |
NEWS_FLAGS(NM_THIN, NF_VIEWPORT | NF_TILE, NT_OPENCLOSE, 0), ind->xy, 0); |
0 | 1845 |
} |
1846 |
||
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1847 |
/** |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1848 |
* Protects an industry from closure if the appropriate flags and conditions are met |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1849 |
* INDUSTRYBEH_CANCLOSE_LASTINSTANCE must be set (which, by default, it is not) and the |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1850 |
* count of industries of this type must one (or lower) in order to be protected |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1851 |
* against closure. |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1852 |
* @param type IndustryType been queried |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1853 |
* @result true if protection is on, false otherwise (except for oil wells) |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1854 |
*/ |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1855 |
static bool CheckIndustryCloseDownProtection(IndustryType type) |
0 | 1856 |
{ |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1857 |
const IndustrySpec *indspec = GetIndustrySpec(type); |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1858 |
|
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1859 |
/* oil wells (or the industries with that flag set) are always allowed to closedown */ |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1860 |
if (indspec->behaviour & INDUSTRYBEH_DONT_INCR_PROD && _opt.landscape == LT_TEMPERATE) return false; |
8317
fc30c847970b
(svn r11371) -Fix [FS#1396]: the industry protection only kicked in when it should not kick in.
rubidium
parents:
8302
diff
changeset
|
1861 |
return (indspec->behaviour & INDUSTRYBEH_CANCLOSE_LASTINSTANCE) == 0 && GetIndustryTypeCount(type) <= 1; |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1862 |
} |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1863 |
|
8387
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1864 |
/** |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1865 |
* Can given cargo type be accepted or produced by the industry? |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1866 |
* @param cargo: Cargo type |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1867 |
* @param ind: Industry |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1868 |
* @param *c_accepts: Pointer to boolean for acceptance of cargo |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1869 |
* @param *c_produces: Pointer to boolean for production of cargo |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1870 |
* @return: \c *c_accepts is set when industry accepts the cargo type, |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1871 |
* \c *c_produces is set when the industry produces the cargo type |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1872 |
*/ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1873 |
static void CanCargoServiceIndustry(CargoID cargo, Industry *ind, bool *c_accepts, bool *c_produces) |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1874 |
{ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1875 |
const IndustrySpec *indspec = GetIndustrySpec(ind->type); |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1876 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1877 |
/* Check for acceptance of cargo */ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1878 |
for (uint j = 0; j < lengthof(ind->accepts_cargo) && ind->accepts_cargo[j] != CT_INVALID; j++) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1879 |
if (cargo == ind->accepts_cargo[j]) { |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1880 |
if (HasBit(indspec->callback_flags, CBM_IND_REFUSE_CARGO)) { |
8387
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1881 |
uint16 res = GetIndustryCallback(CBID_INDUSTRY_REFUSE_CARGO, |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1882 |
0, GetReverseCargoTranslation(cargo, indspec->grf_prop.grffile), |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1883 |
ind, ind->type, ind->xy); |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1884 |
if (res == 0) continue; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1885 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1886 |
*c_accepts = true; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1887 |
break; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1888 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1889 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1890 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1891 |
/* Check for produced cargo */ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1892 |
for (uint j = 0; j < lengthof(ind->produced_cargo) && ind->produced_cargo[j] != CT_INVALID; j++) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1893 |
if (cargo == ind->produced_cargo[j]) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1894 |
*c_produces = true; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1895 |
break; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1896 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1897 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1898 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1899 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1900 |
/** |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1901 |
* Compute who can service the industry. |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1902 |
* |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1903 |
* Here, 'can service' means that he/she has trains and stations close enough |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1904 |
* to the industry with the right cargo type and the right orders (ie has the |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1905 |
* technical means). |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1906 |
* |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1907 |
* @param ind: Industry being investigated. |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1908 |
* |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1909 |
* @return: 0 if nobody can service the industry, 2 if the local player can |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1910 |
* service the industry, and 1 otherwise (only competitors can service the |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1911 |
* industry) |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1912 |
*/ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1913 |
int WhoCanServiceIndustry(Industry* ind) |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1914 |
{ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1915 |
/* Find all stations within reach of the industry */ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1916 |
StationSet stations = FindStationsAroundIndustryTile(ind->xy, ind->width, ind->height); |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1917 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1918 |
if (stations.size() == 0) return 0; // No stations found at all => nobody services |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1919 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1920 |
const Vehicle *v; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1921 |
int result = 0; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1922 |
FOR_ALL_VEHICLES(v) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1923 |
/* Is it worthwhile to try this vehicle? */ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1924 |
if (v->owner != _local_player && result != 0) continue; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1925 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1926 |
/* Check whether it accepts the right kind of cargo */ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1927 |
bool c_accepts = false; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1928 |
bool c_produces = false; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1929 |
if (v->type == VEH_TRAIN && IsFrontEngine(v)) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1930 |
const Vehicle *u = v; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1931 |
BEGIN_ENUM_WAGONS(u) |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1932 |
CanCargoServiceIndustry(u->cargo_type, ind, &c_accepts, &c_produces); |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1933 |
END_ENUM_WAGONS(u) |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1934 |
} else if (v->type == VEH_ROAD || v->type == VEH_SHIP || v->type == VEH_AIRCRAFT) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1935 |
CanCargoServiceIndustry(v->cargo_type, ind, &c_accepts, &c_produces); |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1936 |
} else { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1937 |
continue; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1938 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1939 |
if (!c_accepts && !c_produces) continue; // Wrong cargo |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1940 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1941 |
/* Check orders of the vehicle. |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1942 |
* We cannot check the first of shared orders only, since the first vehicle in such a chain |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1943 |
* may have a different cargo type. |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1944 |
*/ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1945 |
const Order *o; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1946 |
FOR_VEHICLE_ORDERS(v, o) { |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1947 |
if (o->type == OT_GOTO_STATION && !HasBit(o->flags, OFB_TRANSFER)) { |
8387
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1948 |
/* Vehicle visits a station to load or unload */ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1949 |
Station *st = GetStation(o->dest); |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1950 |
if (!st->IsValid()) continue; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1951 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1952 |
/* Same cargo produced by industry is dropped here => not serviced by vehicle v */ |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
1953 |
if (HasBit(o->flags, OFB_UNLOAD) && !c_accepts) break; |
8387
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1954 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1955 |
if (stations.find(st) != stations.end()) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1956 |
if (v->owner == _local_player) return 2; // Player services industry |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1957 |
result = 1; // Competitor services industry |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1958 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1959 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1960 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1961 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1962 |
return result; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1963 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1964 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1965 |
/** |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1966 |
* Report news that industry production has changed significantly |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1967 |
* |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1968 |
* @param ind: Industry with changed production |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1969 |
* @param type: Cargo type that has changed |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1970 |
* @param percent: Percentage of change (>0 means increase, <0 means decrease) |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1971 |
*/ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1972 |
static void ReportNewsProductionChangeIndustry(Industry *ind, CargoID type, int percent) |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1973 |
{ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1974 |
NewsType nt; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1975 |
|
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1976 |
switch (WhoCanServiceIndustry(ind)) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1977 |
case 0: nt = NT_INDUSTRY_NOBODY; break; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1978 |
case 1: nt = NT_INDUSTRY_OTHER; break; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1979 |
case 2: nt = NT_INDUSTRY_PLAYER; break; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1980 |
default: NOT_REACHED(); break; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1981 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1982 |
SetDParam(2, abs(percent)); |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1983 |
SetDParam(0, GetCargo(type)->name); |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1984 |
SetDParam(1, ind->index); |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1985 |
AddNewsItem( |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1986 |
percent >= 0 ? STR_INDUSTRY_PROD_GOUP : STR_INDUSTRY_PROD_GODOWN, |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1987 |
NEWS_FLAGS(NM_THIN, NF_VIEWPORT | NF_TILE, nt, 0), |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1988 |
ind->xy + TileDiffXY(1, 1), 0 |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1989 |
); |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1990 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
1991 |
|
8441
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
1992 |
enum { |
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
1993 |
PERCENT_TRANSPORTED_60 = 153, |
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
1994 |
}; |
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
1995 |
|
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1996 |
/** Change industry production or do closure |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1997 |
* @param i Industry for which changes are performed |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1998 |
* @param monthly true if it's the monthly call, false if it's the random call |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
1999 |
*/ |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2000 |
static void ChangeIndustryProduction(Industry *i, bool monthly) |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2001 |
{ |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2002 |
extern StringID MapGRFStringID(uint32 grfid, StringID str); |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
2003 |
StringID str = STR_NULL; |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2004 |
bool closeit = false; |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2005 |
const IndustrySpec *indspec = GetIndustrySpec(i->type); |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2006 |
bool standard = true; |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2007 |
bool suppress_message = false; |
8443
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
2008 |
/* don't use smooth economy for industries using production related callbacks */ |
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
2009 |
bool smooth_economy = _patches.smooth_economy && |
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
2010 |
!(HasBit(indspec->callback_flags, CBM_IND_PRODUCTION_256_TICKS) || HasBit(indspec->callback_flags, CBM_IND_PRODUCTION_CARGO_ARRIVAL)) && // production callbacks |
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
2011 |
!(HasBit(indspec->callback_flags, CBM_IND_MONTHLYPROD_CHANGE) || HasBit(indspec->callback_flags, CBM_IND_PRODUCTION_CHANGE)); // production change callbacks |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2012 |
byte div = 0; |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2013 |
byte mul = 0; |
8472
88d932993efd
(svn r11532) -Feature[newgrf]: Add decrement(0x0D) / increment(0x0E) production operations from result of production callback cb29/35.
belugas
parents:
8468
diff
changeset
|
2014 |
int8 increment = 0; |
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
159
diff
changeset
|
2015 |
|
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
2016 |
if (HasBit(indspec->callback_flags, monthly ? CBM_IND_MONTHLYPROD_CHANGE : CBM_IND_PRODUCTION_CHANGE)) { |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2017 |
uint16 res = GetIndustryCallback(monthly ? CBID_INDUSTRY_MONTHLYPROD_CHANGE : CBID_INDUSTRY_PRODUCTION_CHANGE, 0, Random(), i, i->type, i->xy); |
8443
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
2018 |
standard = false; |
8282423fd688
(svn r11502) -Fix (r11144): don't do standard production change if callbacks 29/35 failed
glx
parents:
8441
diff
changeset
|
2019 |
monthly = false; // smooth economy is disabled so we need to fake random industry production change to allow 'use standard' result |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2020 |
if (res != CALLBACK_FAILED) { |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
2021 |
suppress_message = HasBit(res, 7); |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2022 |
/* Get the custom message if any */ |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
2023 |
if (HasBit(res, 8)) str = MapGRFStringID(indspec->grf_prop.grffile->grfid, GB(GetRegister(0x100), 0, 16)); |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2024 |
res = GB(res, 0, 4); |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2025 |
switch(res) { |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2026 |
default: NOT_REACHED(); |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2027 |
case 0x0: break; // Do nothing, but show the custom message if any |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2028 |
case 0x1: div = 1; break; // Halve industry production. If production reaches the quarter of the default, the industry is closed instead. |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2029 |
case 0x2: mul = 1; break; // Double industry production if it hasn't reached eight times of the original yet. |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2030 |
case 0x3: closeit = true; break; // The industry announces imminent closure, and is physically removed from the map next month. |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2031 |
case 0x4: standard = true; break; // Do the standard random production change as if this industry was a primary one. |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2032 |
case 0x5: case 0x6: case 0x7: // Divide production by 4, 8, 16 |
8440
defae749cc64
(svn r11499) -Fix (r11144): mul/div factor were wrong (off by two)
glx
parents:
8424
diff
changeset
|
2033 |
case 0x8: div = res - 0x3; break; // Divide production by 32 |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2034 |
case 0x9: case 0xA: case 0xB: // Multiply production by 4, 8, 16 |
8440
defae749cc64
(svn r11499) -Fix (r11144): mul/div factor were wrong (off by two)
glx
parents:
8424
diff
changeset
|
2035 |
case 0xC: mul = res - 0x7; break; // Multiply production by 32 |
8472
88d932993efd
(svn r11532) -Feature[newgrf]: Add decrement(0x0D) / increment(0x0E) production operations from result of production callback cb29/35.
belugas
parents:
8468
diff
changeset
|
2036 |
case 0xD: // decrement production |
88d932993efd
(svn r11532) -Feature[newgrf]: Add decrement(0x0D) / increment(0x0E) production operations from result of production callback cb29/35.
belugas
parents:
8468
diff
changeset
|
2037 |
case 0xE: // increment production |
88d932993efd
(svn r11532) -Feature[newgrf]: Add decrement(0x0D) / increment(0x0E) production operations from result of production callback cb29/35.
belugas
parents:
8468
diff
changeset
|
2038 |
increment = res == 0x0D ? -1 : 1; |
88d932993efd
(svn r11532) -Feature[newgrf]: Add decrement(0x0D) / increment(0x0E) production operations from result of production callback cb29/35.
belugas
parents:
8468
diff
changeset
|
2039 |
break; |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2040 |
} |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2041 |
} |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2042 |
} |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
2043 |
|
8172
1e26cade13cb
(svn r11207) -Fix [FS#1301]: don't use smooth_economy for industries using production callbacks as they may have no production for more than a month
glx
parents:
8162
diff
changeset
|
2044 |
if (standard && monthly != smooth_economy) return; |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2045 |
|
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2046 |
if (standard && indspec->life_type == INDUSTRYLIFE_BLACK_HOLE) return; |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2047 |
|
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2048 |
if (standard && (indspec->life_type & (INDUSTRYLIFE_ORGANIC | INDUSTRYLIFE_EXTRACTIVE)) != 0) { |
7640
81b9fe4a2631
(svn r10418) -Codechange: implement/resurrect the industry production flags.
rubidium
parents:
7628
diff
changeset
|
2049 |
/* decrease or increase */ |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2050 |
bool only_decrease = (indspec->behaviour & INDUSTRYBEH_DONT_INCR_PROD) && _opt.landscape == LT_TEMPERATE; |
7640
81b9fe4a2631
(svn r10418) -Codechange: implement/resurrect the industry production flags.
rubidium
parents:
7628
diff
changeset
|
2051 |
|
8172
1e26cade13cb
(svn r11207) -Fix [FS#1301]: don't use smooth_economy for industries using production callbacks as they may have no production for more than a month
glx
parents:
8162
diff
changeset
|
2052 |
if (smooth_economy) { |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2053 |
closeit = true; |
8141
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
2054 |
for (byte j = 0; j < 2 && i->produced_cargo[j] != CT_INVALID; j++){ |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2055 |
int old_prod, new_prod, percent; |
8441
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
2056 |
int mult = (i->last_month_pct_transported[j] > PERCENT_TRANSPORTED_60) ? 1 : -1; |
7640
81b9fe4a2631
(svn r10418) -Codechange: implement/resurrect the industry production flags.
rubidium
parents:
7628
diff
changeset
|
2057 |
|
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2058 |
new_prod = old_prod = i->production_rate[j]; |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2059 |
|
8468
49005a635367
(svn r11528) -Fix (r11500): With smooth economy enabled, industries that should only decrease production would always increase it when more than 60% was transported.
maedhros
parents:
8466
diff
changeset
|
2060 |
if (only_decrease) { |
49005a635367
(svn r11528) -Fix (r11500): With smooth economy enabled, industries that should only decrease production would always increase it when more than 60% was transported.
maedhros
parents:
8466
diff
changeset
|
2061 |
mult = -1; |
49005a635367
(svn r11528) -Fix (r11500): With smooth economy enabled, industries that should only decrease production would always increase it when more than 60% was transported.
maedhros
parents:
8466
diff
changeset
|
2062 |
} else if (Chance16(1, 3)) { |
49005a635367
(svn r11528) -Fix (r11500): With smooth economy enabled, industries that should only decrease production would always increase it when more than 60% was transported.
maedhros
parents:
8466
diff
changeset
|
2063 |
mult *= -1; |
49005a635367
(svn r11528) -Fix (r11500): With smooth economy enabled, industries that should only decrease production would always increase it when more than 60% was transported.
maedhros
parents:
8466
diff
changeset
|
2064 |
} |
8441
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
2065 |
|
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
2066 |
if (Chance16(1, 22)) { |
8441
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
2067 |
new_prod += mult * (max(((RandomRange(50) + 10) * old_prod) >> 8, 1U)); |
7640
81b9fe4a2631
(svn r10418) -Codechange: implement/resurrect the industry production flags.
rubidium
parents:
7628
diff
changeset
|
2068 |
} |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2069 |
|
8441
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
2070 |
/* Prevent production to overflow or Oil Rig passengers to be over-"produced" */ |
8418
b49fc6be1ab9
(svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents:
8387
diff
changeset
|
2071 |
new_prod = Clamp(new_prod, 1, 255); |
8441
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
2072 |
|
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
2073 |
if (((indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER) != 0) && j == 1) |
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
2074 |
new_prod = Clamp(new_prod, 0, 16); |
02fa5c49a79b
(svn r11500) -Codechange: Smooth economy fine-tuning, making industries more responsive. Patch by Sirkoz.
belugas
parents:
8440
diff
changeset
|
2075 |
|
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2076 |
/* Do not stop closing the industry when it has the lowest possible production rate */ |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2077 |
if (new_prod == old_prod && old_prod > 1) { |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2078 |
closeit = false; |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2079 |
continue; |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2080 |
} |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2081 |
|
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2082 |
percent = (old_prod == 0) ? 100 : (new_prod * 100 / old_prod - 100); |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2083 |
i->production_rate[j] = new_prod; |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2084 |
|
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2085 |
/* Close the industry when it has the lowest possible production rate */ |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2086 |
if (new_prod > 1) closeit = false; |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2087 |
|
8387
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2088 |
if (abs(percent) >= 10) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2089 |
ReportNewsProductionChangeIndustry(i, i->produced_cargo[j], percent); |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2090 |
} |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2091 |
} |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2092 |
} else { |
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
2093 |
if (only_decrease || Chance16(1, 3)) { |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2094 |
/* If you transport > 60%, 66% chance we increase, else 33% chance we increase */ |
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
2095 |
if (!only_decrease && (i->last_month_pct_transported[0] > PERCENT_TRANSPORTED_60) != Chance16(1, 3)) { |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2096 |
mul = 1; // Increase production |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
2097 |
} else { |
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2098 |
div = 1; // Decrease production |
0 | 2099 |
} |
2100 |
} |
|
7640
81b9fe4a2631
(svn r10418) -Codechange: implement/resurrect the industry production flags.
rubidium
parents:
7628
diff
changeset
|
2101 |
} |
81b9fe4a2631
(svn r10418) -Codechange: implement/resurrect the industry production flags.
rubidium
parents:
7628
diff
changeset
|
2102 |
} |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2103 |
|
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2104 |
if (standard && indspec->life_type & INDUSTRYLIFE_PROCESSING) { |
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
2105 |
if ( (byte)(_cur_year - i->last_prod_year) >= 5 && Chance16(1, smooth_economy ? 180 : 2)) { |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2106 |
closeit = true; |
7640
81b9fe4a2631
(svn r10418) -Codechange: implement/resurrect the industry production flags.
rubidium
parents:
7628
diff
changeset
|
2107 |
} |
1320
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
2108 |
} |
bf9623526d71
(svn r1824) -Codechange: made ChangeIndustryProduction a bit more readable
truelight
parents:
1287
diff
changeset
|
2109 |
|
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2110 |
/* Increase if needed */ |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2111 |
while (mul-- != 0 && i->prod_level < 0x80) { |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2112 |
i->prod_level <<= 1; |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2113 |
i->production_rate[0] = min(i->production_rate[0] * 2, 0xFF); |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2114 |
i->production_rate[1] = min(i->production_rate[1] * 2, 0xFF); |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2115 |
if (str == STR_NULL) str = indspec->production_up_text; |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2116 |
} |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2117 |
|
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2118 |
/* Decrease if needed */ |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2119 |
while (div-- != 0 && !closeit) { |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2120 |
if (i->prod_level == 4) { |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2121 |
closeit = true; |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2122 |
} else { |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2123 |
i->prod_level >>= 1; |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2124 |
i->production_rate[0] = (i->production_rate[0] + 1) >> 1; |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2125 |
i->production_rate[1] = (i->production_rate[1] + 1) >> 1; |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2126 |
if (str == STR_NULL) str = indspec->production_down_text; |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2127 |
} |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2128 |
} |
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2129 |
|
8472
88d932993efd
(svn r11532) -Feature[newgrf]: Add decrement(0x0D) / increment(0x0E) production operations from result of production callback cb29/35.
belugas
parents:
8468
diff
changeset
|
2130 |
if (increment != 0) { |
88d932993efd
(svn r11532) -Feature[newgrf]: Add decrement(0x0D) / increment(0x0E) production operations from result of production callback cb29/35.
belugas
parents:
8468
diff
changeset
|
2131 |
i->prod_level = ClampU(i->prod_level + increment, 4, 0x80); |
88d932993efd
(svn r11532) -Feature[newgrf]: Add decrement(0x0D) / increment(0x0E) production operations from result of production callback cb29/35.
belugas
parents:
8468
diff
changeset
|
2132 |
if (i->prod_level == 4) closeit = true; |
88d932993efd
(svn r11532) -Feature[newgrf]: Add decrement(0x0D) / increment(0x0E) production operations from result of production callback cb29/35.
belugas
parents:
8468
diff
changeset
|
2133 |
} |
88d932993efd
(svn r11532) -Feature[newgrf]: Add decrement(0x0D) / increment(0x0E) production operations from result of production callback cb29/35.
belugas
parents:
8468
diff
changeset
|
2134 |
|
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2135 |
/* Close if needed and allowed */ |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2136 |
if (closeit && !CheckIndustryCloseDownProtection(i->type)) { |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2137 |
i->prod_level = 0; |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2138 |
str = indspec->closure_text; |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2139 |
} |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2140 |
|
8111
23e6be5756bb
(svn r11144) -Codechange: add support for newgrf callbacks 29 and 35
glx
parents:
8109
diff
changeset
|
2141 |
if (!suppress_message && str != STR_NULL) { |
8387
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2142 |
NewsType nt; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2143 |
/* Compute news category */ |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2144 |
if (closeit) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2145 |
nt = NT_OPENCLOSE; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2146 |
} else { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2147 |
switch (WhoCanServiceIndustry(i)) { |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2148 |
case 0: nt = NT_INDUSTRY_NOBODY; break; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2149 |
case 1: nt = NT_INDUSTRY_OTHER; break; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2150 |
case 2: nt = NT_INDUSTRY_PLAYER; break; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2151 |
default: NOT_REACHED(); break; |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2152 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2153 |
} |
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2154 |
/* Set parameters of news string */ |
8251
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
2155 |
if (str > STR_LAST_STRINGID) { |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
2156 |
SetDParam(0, STR_TOWN); |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
2157 |
SetDParam(1, i->town->index); |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
2158 |
SetDParam(2, indspec->name); |
8366
3655a6a37683
(svn r11420) -Fix [FS#1006]: industry closure news not properly shown when the news item pops up after the industry has been removed from the map.
rubidium
parents:
8358
diff
changeset
|
2159 |
} else if (closeit) { |
3655a6a37683
(svn r11420) -Fix [FS#1006]: industry closure news not properly shown when the news item pops up after the industry has been removed from the map.
rubidium
parents:
8358
diff
changeset
|
2160 |
SetDParam(0, STR_INDUSTRY_FORMAT); |
3655a6a37683
(svn r11420) -Fix [FS#1006]: industry closure news not properly shown when the news item pops up after the industry has been removed from the map.
rubidium
parents:
8358
diff
changeset
|
2161 |
SetDParam(1, i->town->index); |
3655a6a37683
(svn r11420) -Fix [FS#1006]: industry closure news not properly shown when the news item pops up after the industry has been removed from the map.
rubidium
parents:
8358
diff
changeset
|
2162 |
SetDParam(2, indspec->name); |
8251
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
2163 |
} else { |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
2164 |
SetDParam(0, i->index); |
2791c76125c0
(svn r11293) -Fix: newgrf defined industry news messages use TTD format for args, which is not the same as our. So we must detect those strings and pass them the right params
glx
parents:
8244
diff
changeset
|
2165 |
} |
8387
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2166 |
/* and report the news to the user */ |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2167 |
AddNewsItem(str, |
8387
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2168 |
NEWS_FLAGS(NM_THIN, NF_VIEWPORT | NF_TILE, nt, 0), |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2169 |
i->xy + TileDiffXY(1, 1), 0); |
0 | 2170 |
} |
2171 |
} |
|
2172 |
||
6573 | 2173 |
void IndustryMonthlyLoop() |
0 | 2174 |
{ |
2175 |
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
|
2176 |
PlayerID old_player = _current_player; |
266
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
2177 |
_current_player = OWNER_NONE; |
0 | 2178 |
|
830
8114845804c9
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
817
diff
changeset
|
2179 |
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
|
2180 |
UpdateIndustryStatistics(i); |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2181 |
if (i->prod_level == 0) { |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2182 |
delete i; |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2183 |
} else { |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2184 |
ChangeIndustryProduction(i, true); |
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2185 |
} |
0 | 2186 |
} |
2187 |
||
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
2188 |
/* 3% chance that we start a new industry */ |
8463
3920ac0ab803
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
8444
diff
changeset
|
2189 |
if (Chance16(3, 100)) { |
6915
99e67df845fd
(svn r9555) -Codechange: Cleanup of industry_cmd (Step-9). Use in-game appearing chances for industry creation.
belugas
parents:
6886
diff
changeset
|
2190 |
MaybeNewIndustry(); |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2191 |
} else { |
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
|
2192 |
i = GetRandomIndustry(); |
8109
6bd72fb7d645
(svn r11142) -Codechange: prepare industry production change code for newgrf callbacks 29 and 35
glx
parents:
8106
diff
changeset
|
2193 |
if (i != NULL) ChangeIndustryProduction(i, false); |
0 | 2194 |
} |
266
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
2195 |
|
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
2196 |
_current_player = old_player; |
d704fabab036
(svn r272) -Fix: industries are once again generated on a new map
darkvater
parents:
201
diff
changeset
|
2197 |
|
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
2198 |
/* production-change */ |
0 | 2199 |
_industry_sort_dirty = true; |
2200 |
InvalidateWindow(WC_INDUSTRY_DIRECTORY, 0); |
|
2201 |
} |
|
2202 |
||
2203 |
||
6573 | 2204 |
void InitializeIndustries() |
0 | 2205 |
{ |
7897
222641b84fc4
(svn r10773) -Codechange: use pool.CleanPool instead of CleanPool(&pool) and similarly for AddBlock*.
rubidium
parents:
7886
diff
changeset
|
2206 |
_Industry_pool.CleanPool(); |
222641b84fc4
(svn r10773) -Codechange: use pool.CleanPool instead of CleanPool(&pool) and similarly for AddBlock*.
rubidium
parents:
7886
diff
changeset
|
2207 |
_Industry_pool.AddBlockToPool(); |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
909
diff
changeset
|
2208 |
|
7335
027d2caa4646
(svn r10078) -Codechange: Centralize all industry counts data and access
belugas
parents:
7320
diff
changeset
|
2209 |
ResetIndustryCounts(); |
0 | 2210 |
_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
|
2211 |
_industry_sound_tile = 0; |
0 | 2212 |
} |
2213 |
||
7681
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2214 |
bool IndustrySpec::IsRawIndustry() const |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2215 |
{ |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2216 |
/* Lumber mills are extractive/organic, but can always be built like a non-raw industry */ |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2217 |
return (this->life_type & (INDUSTRYLIFE_EXTRACTIVE | INDUSTRYLIFE_ORGANIC)) != 0 && |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2218 |
(this->behaviour & INDUSTRYBEH_CUT_TREES) == 0; |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2219 |
} |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2220 |
|
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2221 |
Money IndustrySpec::GetConstructionCost() const |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2222 |
{ |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2223 |
return (_price.build_industry * |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2224 |
(_patches.raw_industry_construction == 1 && this->IsRawIndustry() ? |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2225 |
this->raw_industry_cost_multiplier : |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2226 |
this->cost_multiplier |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2227 |
)) >> 8; |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2228 |
} |
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2229 |
|
8474
358b35762f02
(svn r11534) -Feature(newgrf): Implement property 23h for Industries.
belugas
parents:
8472
diff
changeset
|
2230 |
Money IndustrySpec::GetRemovalCost() const |
358b35762f02
(svn r11534) -Feature(newgrf): Implement property 23h for Industries.
belugas
parents:
8472
diff
changeset
|
2231 |
{ |
358b35762f02
(svn r11534) -Feature(newgrf): Implement property 23h for Industries.
belugas
parents:
8472
diff
changeset
|
2232 |
return (_price.remove_house * this->removal_cost_multiplier) >> 8; |
358b35762f02
(svn r11534) -Feature(newgrf): Implement property 23h for Industries.
belugas
parents:
8472
diff
changeset
|
2233 |
} |
358b35762f02
(svn r11534) -Feature(newgrf): Implement property 23h for Industries.
belugas
parents:
8472
diff
changeset
|
2234 |
|
7990
70039e33e893
(svn r11005) -Codechange: move the tiletype specific terraforming checks to the functions for those tile types.
rubidium
parents:
7976
diff
changeset
|
2235 |
static CommandCost TerraformTile_Industry(TileIndex tile, uint32 flags, uint z_new, Slope tileh_new) |
70039e33e893
(svn r11005) -Codechange: move the tiletype specific terraforming checks to the functions for those tile types.
rubidium
parents:
7976
diff
changeset
|
2236 |
{ |
8078
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2237 |
if (AutoslopeEnabled()) { |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2238 |
/* We imitate here TTDP's behaviour: |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2239 |
* - Both new and old slope must not be steep. |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2240 |
* - TileMaxZ must not be changed. |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2241 |
* - Allow autoslope by default. |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2242 |
* - Disallow autoslope if callback succeeds and returns non-zero. |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2243 |
*/ |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2244 |
Slope tileh_old = GetTileSlope(tile, NULL); |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2245 |
/* TileMaxZ must not be changed. Slopes must not be steep. */ |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2246 |
if (!IsSteepSlope(tileh_old) && !IsSteepSlope(tileh_new) && (GetTileMaxZ(tile) == z_new + GetSlopeMaxZ(tileh_new))) { |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2247 |
const IndustryGfx gfx = GetIndustryGfx(tile); |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2248 |
const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx); |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2249 |
|
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2250 |
/* Call callback 3C 'disable autosloping for industry tiles'. */ |
8424
4a488a90ccab
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
8418
diff
changeset
|
2251 |
if (HasBit(itspec->callback_flags, CBM_INDT_AUTOSLOPE)) { |
8078
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2252 |
/* If the callback fails, allow autoslope. */ |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2253 |
uint16 res = GetIndustryTileCallback(CBID_INDUSTRY_AUTOSLOPE, 0, 0, gfx, GetIndustryByTile(tile), tile); |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2254 |
if ((res == 0) || (res == CALLBACK_FAILED)) return _price.terraform; |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2255 |
} else { |
8387
30f519812d62
(svn r11442) -Feature: make news messages related to the industry (production) changes better configurable; you can now disable news messages popping up for industries you are not servicing. Patch by Alberth.
rubidium
parents:
8366
diff
changeset
|
2256 |
/* allow autoslope */ |
8078
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2257 |
return _price.terraform; |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2258 |
} |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2259 |
} |
bdf94bf88568
(svn r11107) -Feature: some tool so one can still build tunnels under rails (and other structures) when the owner of the structure built it on foundations and if you have enough "empty" space ofcourse. One could use the tool for some other construction needs too. Patch by frosch.
rubidium
parents:
8073
diff
changeset
|
2260 |
} |
8133
597f682ff48d
(svn r11168) -Fix [FS#1256]: assert on terraforming of industries. Patch by frosch.
rubidium
parents:
8125
diff
changeset
|
2261 |
return DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); |
7990
70039e33e893
(svn r11005) -Codechange: move the tiletype specific terraforming checks to the functions for those tile types.
rubidium
parents:
7976
diff
changeset
|
2262 |
} |
7681
0105448f6e5c
(svn r10459) -Codechange: add helper functions to determine whether an industry is a primary industry and how much it costs to build such an industry.
rubidium
parents:
7673
diff
changeset
|
2263 |
|
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
2264 |
extern 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
|
2265 |
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
|
2266 |
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
|
2267 |
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
|
2268 |
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
|
2269 |
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
|
2270 |
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
|
2271 |
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
|
2272 |
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
|
2273 |
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
|
2274 |
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
|
2275 |
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
|
2276 |
NULL, /* vehicle_enter_tile_proc */ |
7831
5dded9b03500
(svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents:
7830
diff
changeset
|
2277 |
GetFoundation_Industry, /* get_foundation_proc */ |
7990
70039e33e893
(svn r11005) -Codechange: move the tiletype specific terraforming checks to the functions for those tile types.
rubidium
parents:
7976
diff
changeset
|
2278 |
TerraformTile_Industry, /* terraform_tile_proc */ |
0 | 2279 |
}; |
2280 |
||
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
|
2281 |
static const SaveLoad _industry_desc[] = { |
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2282 |
SLE_CONDVAR(Industry, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2283 |
SLE_CONDVAR(Industry, xy, SLE_UINT32, 6, SL_MAX_VERSION), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2284 |
SLE_VAR(Industry, width, SLE_UINT8), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2285 |
SLE_VAR(Industry, height, SLE_UINT8), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2286 |
SLE_REF(Industry, town, REF_TOWN), |
7132
08abbae3073e
(svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead.
belugas
parents:
7056
diff
changeset
|
2287 |
SLE_CONDNULL( 2, 2, 60), ///< used to be industry's produced_cargo |
8141
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
2288 |
SLE_CONDARR(Industry, produced_cargo, SLE_UINT8, 2, 78, SL_MAX_VERSION), |
7661
40c7a63ad9a1
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7647
diff
changeset
|
2289 |
SLE_CONDARR(Industry, incoming_cargo_waiting, SLE_UINT16, 3, 70, SL_MAX_VERSION), |
40c7a63ad9a1
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7647
diff
changeset
|
2290 |
SLE_ARR(Industry, produced_cargo_waiting, SLE_UINT16, 2), |
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2291 |
SLE_ARR(Industry, production_rate, SLE_UINT8, 2), |
7132
08abbae3073e
(svn r9867) -Codechange: Remove data duplication. The exact same values can be found in the industry spec, so take it from there instead.
belugas
parents:
7056
diff
changeset
|
2292 |
SLE_CONDNULL( 3, 2, 60), ///< used to be industry's accepts_cargo |
8141
c052dc0dc029
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
8136
diff
changeset
|
2293 |
SLE_CONDARR(Industry, accepts_cargo, SLE_UINT8, 3, 78, SL_MAX_VERSION), |
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2294 |
SLE_VAR(Industry, prod_level, SLE_UINT8), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2295 |
SLE_ARR(Industry, this_month_production, SLE_UINT16, 2), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2296 |
SLE_ARR(Industry, this_month_transported, SLE_UINT16, 2), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2297 |
SLE_ARR(Industry, last_month_pct_transported, SLE_UINT8, 2), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2298 |
SLE_ARR(Industry, last_month_production, SLE_UINT16, 2), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2299 |
SLE_ARR(Industry, last_month_transported, SLE_UINT16, 2), |
0 | 2300 |
|
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2301 |
SLE_VAR(Industry, counter, SLE_UINT16), |
0 | 2302 |
|
7315
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2303 |
SLE_VAR(Industry, type, SLE_UINT8), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2304 |
SLE_VAR(Industry, owner, SLE_UINT8), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2305 |
SLE_VAR(Industry, random_color, SLE_UINT8), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2306 |
SLE_CONDVAR(Industry, last_prod_year, SLE_FILE_U8 | SLE_VAR_I32, 0, 30), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2307 |
SLE_CONDVAR(Industry, last_prod_year, SLE_INT32, 31, SL_MAX_VERSION), |
f1b2591ad082
(svn r10058) -Codechange: give some industry variable sensible names (like not telling "last_mo_production" when it is the production of the current month).
rubidium
parents:
7311
diff
changeset
|
2308 |
SLE_VAR(Industry, was_cargo_delivered, SLE_UINT8), |
0 | 2309 |
|
8018
03b60ab13605
(svn r11041) -Fix (r10460) [FS#1195]: the industry's owner was saved twice instead of the owner and the founder. Patch by frosch.
rubidium
parents:
7990
diff
changeset
|
2310 |
SLE_CONDVAR(Industry, founder, SLE_UINT8, 70, SL_MAX_VERSION), |
7682
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
2311 |
SLE_CONDVAR(Industry, construction_date, SLE_INT32, 70, SL_MAX_VERSION), |
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
2312 |
SLE_CONDVAR(Industry, construction_type, SLE_UINT8, 70, SL_MAX_VERSION), |
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
2313 |
SLE_CONDVAR(Industry, last_cargo_accepted_at, SLE_INT32, 70, SL_MAX_VERSION), |
7941
ddf9d11e6df8
(svn r10903) -Feature: [NewGRF] Add support for variable 44 of Variational Action 2 for Industries
belugas
parents:
7916
diff
changeset
|
2314 |
SLE_CONDVAR(Industry, selected_layout, SLE_UINT8, 73, SL_MAX_VERSION), |
7682
263dbeceba12
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7681
diff
changeset
|
2315 |
|
8106
9f527cc360cf
(svn r11139) -Codechange: add support for persistent storage for NewGRFs.
rubidium
parents:
8104
diff
changeset
|
2316 |
SLE_CONDARRX(cpp_offsetof(Industry, psa) + cpp_offsetof(Industry::PersistentStorage, storage), SLE_UINT32, 16, 76, SL_MAX_VERSION), |
9f527cc360cf
(svn r11139) -Codechange: add support for persistent storage for NewGRFs.
rubidium
parents:
8104
diff
changeset
|
2317 |
|
8356
4d72bac74977
(svn r11410) -Codechange: implement random triggers for industries.
rubidium
parents:
8349
diff
changeset
|
2318 |
SLE_CONDVAR(Industry, random_triggers, SLE_UINT8, 82, SL_MAX_VERSION), |
4d72bac74977
(svn r11410) -Codechange: implement random triggers for industries.
rubidium
parents:
8349
diff
changeset
|
2319 |
SLE_CONDVAR(Industry, random, SLE_UINT16, 82, SL_MAX_VERSION), |
4d72bac74977
(svn r11410) -Codechange: implement random triggers for industries.
rubidium
parents:
8349
diff
changeset
|
2320 |
|
6527
f584ab6d87f8
(svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents:
6418
diff
changeset
|
2321 |
/* 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
|
2322 |
SLE_CONDNULL(32, 2, SL_MAX_VERSION), |
0 | 2323 |
|
2324 |
SLE_END() |
|
2325 |
}; |
|
2326 |
||
6573 | 2327 |
static void Save_INDY() |
0 | 2328 |
{ |
2329 |
Industry *ind; |
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
909
diff
changeset
|
2330 |
|
7784
efb98124ce51
(svn r10635) -Codechange: Correct some typos and code beautifying (a little bit)
belugas
parents:
7762
diff
changeset
|
2331 |
/* Write the industries */ |
830
8114845804c9
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
817
diff
changeset
|
2332 |
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
|
2333 |
SlSetArrayIndex(ind->index); |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
2334 |
SlObject(ind, _industry_desc); |
0 | 2335 |
} |
2336 |
} |
|
2337 |
||
7786
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2338 |
/* Save and load the mapping between the industry/tile id on the map, and the grf file |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2339 |
* it came from. */ |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2340 |
static const SaveLoad _industries_id_mapping_desc[] = { |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2341 |
SLE_VAR(EntityIDMapping, grfid, SLE_UINT32), |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2342 |
SLE_VAR(EntityIDMapping, entity_id, SLE_UINT8), |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2343 |
SLE_VAR(EntityIDMapping, substitute_id, SLE_UINT8), |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2344 |
SLE_END() |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2345 |
}; |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2346 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2347 |
static void Save_IIDS() |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2348 |
{ |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2349 |
uint i; |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2350 |
uint j = _industry_mngr.GetMaxMapping(); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2351 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2352 |
for (i = 0; i < j; i++) { |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2353 |
SlSetArrayIndex(i); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2354 |
SlObject(&_industry_mngr.mapping_ID[i], _industries_id_mapping_desc); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2355 |
} |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2356 |
} |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2357 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2358 |
static void Save_TIDS() |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2359 |
{ |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2360 |
uint i; |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2361 |
uint j = _industile_mngr.GetMaxMapping(); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2362 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2363 |
for (i = 0; i < j; i++) { |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2364 |
SlSetArrayIndex(i); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2365 |
SlObject(&_industile_mngr.mapping_ID[i], _industries_id_mapping_desc); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2366 |
} |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2367 |
} |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2368 |
|
6573 | 2369 |
static void Load_INDY() |
0 | 2370 |
{ |
2371 |
int index; |
|
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
2372 |
|
7335
027d2caa4646
(svn r10078) -Codechange: Centralize all industry counts data and access
belugas
parents:
7320
diff
changeset
|
2373 |
ResetIndustryCounts(); |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1247
diff
changeset
|
2374 |
|
0 | 2375 |
while ((index = SlIterateArray()) != -1) { |
7886
b02aa3532d1d
(svn r10759) -Codechange: make the industry struct use the pool item class as super class.
rubidium
parents:
7834
diff
changeset
|
2376 |
Industry *i = new (index) Industry(); |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
909
diff
changeset
|
2377 |
SlObject(i, _industry_desc); |
7320
052da893fbd9
(svn r10063) -Codechange: Change VARDEF for extern
belugas
parents:
7315
diff
changeset
|
2378 |
IncIndustryTypeCount(i->type); |
0 | 2379 |
} |
2380 |
} |
|
2381 |
||
7786
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2382 |
static void Load_IIDS() |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2383 |
{ |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2384 |
int index; |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2385 |
uint max_id; |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2386 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2387 |
/* clear the current mapping stored. |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2388 |
* This will create the manager if ever it is not yet done */ |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2389 |
_industry_mngr.ResetMapping(); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2390 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2391 |
/* get boundary for the temporary map loader NUM_INDUSTRYTYPES? */ |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2392 |
max_id = _industry_mngr.GetMaxMapping(); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2393 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2394 |
while ((index = SlIterateArray()) != -1) { |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2395 |
if ((uint)index >= max_id) break; |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2396 |
SlObject(&_industry_mngr.mapping_ID[index], _industries_id_mapping_desc); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2397 |
} |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2398 |
} |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2399 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2400 |
static void Load_TIDS() |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2401 |
{ |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2402 |
int index; |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2403 |
uint max_id; |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2404 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2405 |
/* clear the current mapping stored. |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2406 |
* This will create the manager if ever it is not yet done */ |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2407 |
_industile_mngr.ResetMapping(); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2408 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2409 |
/* get boundary for the temporary map loader NUM_INDUSTILES? */ |
7788 | 2410 |
max_id = _industile_mngr.GetMaxMapping(); |
7786
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2411 |
|
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2412 |
while ((index = SlIterateArray()) != -1) { |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2413 |
if ((uint)index >= max_id) break; |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2414 |
SlObject(&_industile_mngr.mapping_ID[index], _industries_id_mapping_desc); |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2415 |
} |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2416 |
} |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2417 |
|
5838
9c3129cb019b
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5835
diff
changeset
|
2418 |
extern const ChunkHandler _industry_chunk_handlers[] = { |
7786
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2419 |
{ 'INDY', Save_INDY, Load_INDY, CH_ARRAY}, |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2420 |
{ 'IIDS', Save_IIDS, Load_IIDS, CH_ARRAY}, |
7a03d776107a
(svn r10638) -Codechange: Save the mapping of the industries and tiles, making them persistent.
belugas
parents:
7784
diff
changeset
|
2421 |
{ 'TIDS', Save_TIDS, Load_TIDS, CH_ARRAY | CH_LAST}, |
0 | 2422 |
}; |