author | rubidium |
Mon, 18 Jun 2007 10:48:15 +0000 | |
changeset 6943 | 1914f26aee04 |
parent 6882 | 10263ea04cf3 |
child 6950 | 14ecb0acdfb4 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
3 |
/** @file economy.cpp */ |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1884
diff
changeset
|
6 |
#include "openttd.h" |
2291
c142846954ee
(svn r2815) Store the currency information in one central place instead of scattering it in several unrelated files
tron
parents:
2272
diff
changeset
|
7 |
#include "currency.h" |
2163
b17b313113a0
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
8 |
#include "functions.h" |
6453
226bcddeba32
(svn r9609) -Codechange: Move some function prototypes out of functions.h and into landscape.h, and add a few where they didn't exist.
maedhros
parents:
6432
diff
changeset
|
9 |
#include "landscape.h" |
1309
4403a69da4f8
(svn r1813) Declare functions implemented in strings.c in their own shiny new header (though i think some of these function don't belong into strings.c)
tron
parents:
1308
diff
changeset
|
10 |
#include "strings.h" // XXX InjectDParam() |
507
04b5403aaf6b
(svn r815) Include strings.h only in the files which need it.
tron
parents:
499
diff
changeset
|
11 |
#include "table/strings.h" |
2218
2132596a35c0
(svn r2736) -Codechange: De-mystified GfxDrawFillRect a bit, and used enums from table/sprites.h. You can now change the number of bits used for sprites and switches in the SpriteSetup enum and the rest should work automagically. Can be used to increase the number of active sprites to 2^19 in case there are no colortables (recolor sprites) in any newgrf. We should possibly move the the colortables to an own list, but how to detect them in a newgrf.
celestar
parents:
2186
diff
changeset
|
12 |
#include "table/sprites.h" |
679
04ca2cd69420
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
653
diff
changeset
|
13 |
#include "map.h" |
0 | 14 |
#include "news.h" |
15 |
#include "player.h" |
|
16 |
#include "station.h" |
|
17 |
#include "vehicle.h" |
|
18 |
#include "window.h" |
|
19 |
#include "gfx.h" |
|
20 |
#include "command.h" |
|
21 |
#include "saveload.h" |
|
22 |
#include "economy.h" |
|
23 |
#include "industry.h" |
|
24 |
#include "town.h" |
|
5469
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5426
diff
changeset
|
25 |
#include "network/network.h" |
337
cbe0c766c947
(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk
tron
parents:
260
diff
changeset
|
26 |
#include "sound.h" |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
27 |
#include "engine.h" |
5469
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5426
diff
changeset
|
28 |
#include "network/network_data.h" |
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2150
diff
changeset
|
29 |
#include "variables.h" |
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2150
diff
changeset
|
30 |
#include "vehicle_gui.h" |
2395
d1629f64d157
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2306
diff
changeset
|
31 |
#include "ai/ai.h" |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2642
diff
changeset
|
32 |
#include "train.h" |
6857
60130753e595
(svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for
maedhros
parents:
6844
diff
changeset
|
33 |
#include "roadveh.h" |
5854
9eee280920f0
(svn r8428) -Codechange: Add proper names to aircraft subtypes instead of magic numbers and add a function IsNormalAircraft() which tells us whether the aircraft is in fact some flying device or a rotor/shadow.
Darkvater
parents:
5683
diff
changeset
|
34 |
#include "aircraft.h" |
2962
f0a49b646c48
(svn r3524) - Split newgrf features from engine.[ch] into newgrf_engine.[ch], and add the new files to project files.
peter1138
parents:
2952
diff
changeset
|
35 |
#include "newgrf_engine.h" |
4701 | 36 |
#include "newgrf_sound.h" |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
37 |
#include "newgrf_callbacks.h" |
3386
6d088afdabf4
(svn r4194) -Codechange: Renamed UpdatePlayerHouse to UpdateCompanyHQ because the rest of the code calls it Comapany HQ. Moved it to unmovable_cmd.c because CompanyHQ is an unmovable and has nothing to do with economy.
celestar
parents:
3347
diff
changeset
|
38 |
#include "unmovable.h" |
4261
28670f743746
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
4260
diff
changeset
|
39 |
#include "date.h" |
6091
c8827d9ae04a
(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:
5998
diff
changeset
|
40 |
#include "cargotype.h" |
6190
01a2b579b668
(svn r8969) -Codechange: rework of the player face bits.
rubidium
parents:
6175
diff
changeset
|
41 |
#include "player_face.h" |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6639
diff
changeset
|
42 |
#include "group.h" |
0 | 43 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
44 |
/* Score info */ |
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
45 |
const ScoreInfo _score_info[] = { |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
46 |
{ SCORE_VEHICLES, 120, 100 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
47 |
{ SCORE_STATIONS, 80, 100 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
48 |
{ SCORE_MIN_PROFIT, 10000, 100 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
49 |
{ SCORE_MIN_INCOME, 50000, 50 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
50 |
{ SCORE_MAX_INCOME, 100000, 100 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
51 |
{ SCORE_DELIVERED, 40000, 400 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
52 |
{ SCORE_CARGO, 8, 50 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
53 |
{ SCORE_MONEY, 10000000, 50 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
54 |
{ SCORE_LOAN, 250000, 50 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
55 |
{ SCORE_TOTAL, 0, 0 } |
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
56 |
}; |
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
57 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
58 |
int _score_part[MAX_PLAYERS][SCORE_END]; |
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
59 |
|
2639 | 60 |
int64 CalculateCompanyValue(const Player* p) |
2475 | 61 |
{ |
62 |
PlayerID owner = p->index; |
|
200
03b8104d1479
(svn r201) -Fix: [1025836] Company values bigger dan int32 were put to negative
truelight
parents:
193
diff
changeset
|
63 |
int64 value; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
64 |
|
0 | 65 |
{ |
66 |
Station *st; |
|
67 |
uint num = 0; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
68 |
|
0 | 69 |
FOR_ALL_STATIONS(st) { |
6879
6f2927f456d7
(svn r10122) -Codechange: Add a CountBitsSet function and use it to replace some less efficient loops.
maedhros
parents:
6876
diff
changeset
|
70 |
if (st->owner == owner) num += CountBitsSet(st->facilities); |
0 | 71 |
} |
72 |
||
73 |
value = num * _price.station_value * 25; |
|
74 |
} |
|
75 |
||
76 |
{ |
|
77 |
Vehicle *v; |
|
78 |
||
79 |
FOR_ALL_VEHICLES(v) { |
|
4346
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
80 |
if (v->owner != owner) continue; |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
81 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
82 |
if (v->type == VEH_TRAIN || |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
83 |
v->type == VEH_ROAD || |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
84 |
(v->type == VEH_AIRCRAFT && IsNormalAircraft(v)) || |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
85 |
v->type == VEH_SHIP) { |
0 | 86 |
value += v->value * 3 >> 1; |
87 |
} |
|
88 |
} |
|
89 |
} |
|
90 |
||
997
fa7a654d23ca
(svn r1495) -Fix: Loan does not count against the company value
celestar
parents:
970
diff
changeset
|
91 |
value += p->money64 - p->current_loan; // add real money value |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
997
diff
changeset
|
92 |
|
5601
d58f82901b2f
(svn r8055) -Codechange: Replace the different max, dmax, maxu whatever macros by a simple template function max(), that requires two arguments of the same type. While I'm at it change a variable called "max" to "maxval" in a function that calls max().
celestar
parents:
5587
diff
changeset
|
93 |
return max(value, 1LL); |
0 | 94 |
} |
95 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
96 |
/** if update is set to true, the economy is updated with this score |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
97 |
* (also the house is updated, should only be true in the on-tick event) |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
98 |
* @param update the economy with calculated score |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
99 |
* @param p player been evaluated |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
100 |
* @return actual score of this player |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
101 |
* */ |
147
d0c8100d18cf
(svn r148) -Feature: Company HQ can now be moved somewhere else (cost 1% of company value). Water floods HQ.
darkvater
parents:
116
diff
changeset
|
102 |
int UpdateCompanyRatingAndValue(Player *p, bool update) |
0 | 103 |
{ |
104 |
byte owner = p->index; |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
105 |
int score = 0; |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
106 |
|
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
107 |
memset(_score_part[owner], 0, sizeof(_score_part[owner])); |
0 | 108 |
|
109 |
/* Count vehicles */ |
|
110 |
{ |
|
111 |
Vehicle *v; |
|
2829
fd54aa44d6e0
(svn r3377) -Fix: [ FS#24 ] Min. profit in detail performance rating gave you full points if you had no vehicles, and was limited to 20k. Solved both. (Partly based on Graphite his patch)
truelight
parents:
2815
diff
changeset
|
112 |
int32 min_profit = 0; |
fd54aa44d6e0
(svn r3377) -Fix: [ FS#24 ] Min. profit in detail performance rating gave you full points if you had no vehicles, and was limited to 20k. Solved both. (Partly based on Graphite his patch)
truelight
parents:
2815
diff
changeset
|
113 |
bool min_profit_first = true; |
0 | 114 |
uint num = 0; |
115 |
||
116 |
FOR_ALL_VEHICLES(v) { |
|
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
117 |
if (v->owner != owner) continue; |
6773
bc98b0b16ec4
(svn r10009) -Codechange: Add and use Vehicle::IsPrimaryVehicle to replace individual checks depending on the vehicle type.
maedhros
parents:
6698
diff
changeset
|
118 |
if (IsPlayerBuildableVehicleType(v->type) && v->IsPrimaryVehicle()) { |
0 | 119 |
num++; |
120 |
if (v->age > 730) { |
|
2829
fd54aa44d6e0
(svn r3377) -Fix: [ FS#24 ] Min. profit in detail performance rating gave you full points if you had no vehicles, and was limited to 20k. Solved both. (Partly based on Graphite his patch)
truelight
parents:
2815
diff
changeset
|
121 |
/* Find the vehicle with the lowest amount of profit */ |
fd54aa44d6e0
(svn r3377) -Fix: [ FS#24 ] Min. profit in detail performance rating gave you full points if you had no vehicles, and was limited to 20k. Solved both. (Partly based on Graphite his patch)
truelight
parents:
2815
diff
changeset
|
122 |
if (min_profit_first == true) { |
fd54aa44d6e0
(svn r3377) -Fix: [ FS#24 ] Min. profit in detail performance rating gave you full points if you had no vehicles, and was limited to 20k. Solved both. (Partly based on Graphite his patch)
truelight
parents:
2815
diff
changeset
|
123 |
min_profit = v->profit_last_year; |
fd54aa44d6e0
(svn r3377) -Fix: [ FS#24 ] Min. profit in detail performance rating gave you full points if you had no vehicles, and was limited to 20k. Solved both. (Partly based on Graphite his patch)
truelight
parents:
2815
diff
changeset
|
124 |
min_profit_first = false; |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
125 |
} else if (min_profit > v->profit_last_year) { |
0 | 126 |
min_profit = v->profit_last_year; |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
127 |
} |
0 | 128 |
} |
129 |
} |
|
130 |
} |
|
131 |
||
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
132 |
_score_part[owner][SCORE_VEHICLES] = num; |
2829
fd54aa44d6e0
(svn r3377) -Fix: [ FS#24 ] Min. profit in detail performance rating gave you full points if you had no vehicles, and was limited to 20k. Solved both. (Partly based on Graphite his patch)
truelight
parents:
2815
diff
changeset
|
133 |
/* Don't allow negative min_profit to show */ |
1407
7d3702835802
(svn r1911) Put back an "if" i accidently removed in r1898
tron
parents:
1394
diff
changeset
|
134 |
if (min_profit > 0) |
7d3702835802
(svn r1911) Put back an "if" i accidently removed in r1898
tron
parents:
1394
diff
changeset
|
135 |
_score_part[owner][SCORE_MIN_PROFIT] = min_profit; |
0 | 136 |
} |
137 |
||
138 |
/* Count stations */ |
|
139 |
{ |
|
140 |
uint num = 0; |
|
3033
9cba043eb38f
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3017
diff
changeset
|
141 |
const Station* st; |
0 | 142 |
|
143 |
FOR_ALL_STATIONS(st) { |
|
6879
6f2927f456d7
(svn r10122) -Codechange: Add a CountBitsSet function and use it to replace some less efficient loops.
maedhros
parents:
6876
diff
changeset
|
144 |
if (st->owner == owner) num += CountBitsSet(st->facilities); |
0 | 145 |
} |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
146 |
_score_part[owner][SCORE_STATIONS] = num; |
0 | 147 |
} |
148 |
||
149 |
/* Generate statistics depending on recent income statistics */ |
|
150 |
{ |
|
3033
9cba043eb38f
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3017
diff
changeset
|
151 |
const PlayerEconomyEntry* pee; |
0 | 152 |
int numec; |
153 |
int32 min_income; |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
154 |
int32 max_income; |
0 | 155 |
|
156 |
numec = min(p->num_valid_stat_ent, 12); |
|
157 |
if (numec != 0) { |
|
158 |
min_income = 0x7FFFFFFF; |
|
159 |
max_income = 0; |
|
160 |
pee = p->old_economy; |
|
161 |
do { |
|
162 |
min_income = min(min_income, pee->income + pee->expenses); |
|
163 |
max_income = max(max_income, pee->income + pee->expenses); |
|
164 |
} while (++pee,--numec); |
|
165 |
||
166 |
if (min_income > 0) |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
167 |
_score_part[owner][SCORE_MIN_INCOME] = min_income; |
0 | 168 |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
169 |
_score_part[owner][SCORE_MAX_INCOME] = max_income; |
0 | 170 |
} |
171 |
} |
|
172 |
||
173 |
/* Generate score depending on amount of transported cargo */ |
|
174 |
{ |
|
3033
9cba043eb38f
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3017
diff
changeset
|
175 |
const PlayerEconomyEntry* pee; |
0 | 176 |
int numec; |
177 |
uint32 total_delivered; |
|
178 |
||
179 |
numec = min(p->num_valid_stat_ent, 4); |
|
180 |
if (numec != 0) { |
|
181 |
pee = p->old_economy; |
|
182 |
total_delivered = 0; |
|
183 |
do { |
|
184 |
total_delivered += pee->delivered_cargo; |
|
185 |
} while (++pee,--numec); |
|
186 |
||
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
187 |
_score_part[owner][SCORE_DELIVERED] = total_delivered; |
0 | 188 |
} |
189 |
} |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
190 |
|
0 | 191 |
/* Generate score for variety of cargo */ |
192 |
{ |
|
6879
6f2927f456d7
(svn r10122) -Codechange: Add a CountBitsSet function and use it to replace some less efficient loops.
maedhros
parents:
6876
diff
changeset
|
193 |
uint num = CountBitsSet(p->cargo_types); |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
194 |
_score_part[owner][SCORE_CARGO] = num; |
3033
9cba043eb38f
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3017
diff
changeset
|
195 |
if (update) p->cargo_types = 0; |
0 | 196 |
} |
197 |
||
198 |
/* Generate score for player money */ |
|
199 |
{ |
|
200 |
int32 money = p->player_money; |
|
201 |
if (money > 0) { |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
202 |
_score_part[owner][SCORE_MONEY] = money; |
0 | 203 |
} |
204 |
} |
|
205 |
||
206 |
/* Generate score for loan */ |
|
207 |
{ |
|
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
208 |
_score_part[owner][SCORE_LOAN] = _score_info[SCORE_LOAN].needed - p->current_loan; |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
209 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
210 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
211 |
/* Now we calculate the score for each item.. */ |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
212 |
{ |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
213 |
int total_score = 0; |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
214 |
int s; |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
215 |
score = 0; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
216 |
for (ScoreID i = SCORE_BEGIN; i < SCORE_END; i++) { |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
217 |
/* Skip the total */ |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
218 |
if (i == SCORE_TOTAL) continue; |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
219 |
/* Check the score */ |
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
220 |
s = (_score_part[owner][i] >= _score_info[i].needed) ? |
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
221 |
_score_info[i].score : |
3033
9cba043eb38f
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3017
diff
changeset
|
222 |
_score_part[owner][i] * _score_info[i].score / _score_info[i].needed; |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
223 |
if (s < 0) s = 0; |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
224 |
score += s; |
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
225 |
total_score += _score_info[i].score; |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
226 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
227 |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
228 |
_score_part[owner][SCORE_TOTAL] = score; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
229 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
230 |
/* We always want the score scaled to SCORE_MAX (1000) */ |
3033
9cba043eb38f
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3017
diff
changeset
|
231 |
if (total_score != SCORE_MAX) score = score * SCORE_MAX / total_score; |
0 | 232 |
} |
233 |
||
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
234 |
if (update) { |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
235 |
p->old_economy[0].performance_history = score; |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
236 |
UpdateCompanyHQ(p, score); |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
237 |
p->old_economy[0].company_value = CalculateCompanyValue(p); |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
238 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
239 |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
240 |
InvalidateWindow(WC_PERFORMANCE_DETAIL, 0); |
147
d0c8100d18cf
(svn r148) -Feature: Company HQ can now be moved somewhere else (cost 1% of company value). Water floods HQ.
darkvater
parents:
116
diff
changeset
|
241 |
return score; |
0 | 242 |
} |
243 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
244 |
/* use PLAYER_SPECTATOR as new_player to delete the player. */ |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
245 |
void ChangeOwnershipOfPlayerItems(PlayerID old_player, PlayerID new_player) |
0 | 246 |
{ |
5284
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
247 |
Town *t; |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
248 |
PlayerID old = _current_player; |
6403
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
249 |
|
6405
aa7d8578cce9
(svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities
celestar
parents:
6403
diff
changeset
|
250 |
assert(old_player != new_player); |
aa7d8578cce9
(svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities
celestar
parents:
6403
diff
changeset
|
251 |
|
6403
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
252 |
{ |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
253 |
Player *p; |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
254 |
uint i; |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
255 |
|
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
256 |
/* See if the old_player had shares in other companies */ |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
257 |
_current_player = old_player; |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
258 |
FOR_ALL_PLAYERS(p) { |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
259 |
for (i = 0; i < 4; i++) { |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
260 |
if (p->share_owners[i] == old_player) { |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
261 |
/* Sell his shares */ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
262 |
CommandCost res = DoCommand(0, p->index, 0, DC_EXEC, CMD_SELL_SHARE_IN_COMPANY); |
6403
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
263 |
/* Because we are in a DoCommand, we can't just execute an other one and |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
264 |
* expect the money to be removed. We need to do it ourself! */ |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
265 |
SubtractMoneyFromPlayer(res); |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
266 |
} |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
267 |
} |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
268 |
} |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
269 |
|
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
270 |
/* Sell all the shares that people have on this company */ |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
271 |
p = GetPlayer(old_player); |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
272 |
for (i = 0; i < 4; i++) { |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
273 |
_current_player = p->share_owners[i]; |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
274 |
if (_current_player != PLAYER_SPECTATOR) { |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
275 |
/* Sell the shares */ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
276 |
CommandCost res = DoCommand(0, old_player, 0, DC_EXEC, CMD_SELL_SHARE_IN_COMPANY); |
6403
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
277 |
/* Because we are in a DoCommand, we can't just execute an other one and |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
278 |
* expect the money to be removed. We need to do it ourself! */ |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
279 |
SubtractMoneyFromPlayer(res); |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
280 |
} |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
281 |
} |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
282 |
} |
56a00bf0531b
(svn r9533) -Fix [FS#274]: when a company is removed (either via auto-clean, bankrupt, or take over), sell all the shares he has first, then sell the shares all people have on this company, and then remove the company.
truelight
parents:
6369
diff
changeset
|
283 |
|
0 | 284 |
_current_player = old_player; |
285 |
||
4260
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
286 |
/* Temporarily increase the player's money, to be sure that |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4540
diff
changeset
|
287 |
* removing his/her property doesn't fail because of lack of money. |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4540
diff
changeset
|
288 |
* Not too drastically though, because it could overflow */ |
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4845
diff
changeset
|
289 |
if (new_player == PLAYER_SPECTATOR) { |
4540
ceddbcae93d9
(svn r6369) -Fix (r5886): On loading of game in scenario editor the player was given
Darkvater
parents:
4434
diff
changeset
|
290 |
GetPlayer(old_player)->money64 = MAX_UVALUE(uint64) >>2; // jackpot ;p |
4423
26a10a270104
(svn r6178) -Fix r5886: only setting ->money64 isn't enough, as some routines still use ->player_money.
truelight
parents:
4356
diff
changeset
|
291 |
UpdatePlayerMoney32(GetPlayer(old_player)); |
4260
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
292 |
} |
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
293 |
|
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4845
diff
changeset
|
294 |
if (new_player == PLAYER_SPECTATOR) { |
0 | 295 |
Subsidy *s; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
296 |
|
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
297 |
for (s = _subsidies; s != endof(_subsidies); s++) { |
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
298 |
if (s->cargo_type != CT_INVALID && s->age >= 12) { |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
299 |
if (GetStation(s->to)->owner == old_player) s->cargo_type = CT_INVALID; |
0 | 300 |
} |
301 |
} |
|
302 |
} |
|
303 |
||
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
304 |
/* Take care of rating in towns */ |
5284
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
305 |
FOR_ALL_TOWNS(t) { |
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
306 |
/* If a player takes over, give the ratings to that player. */ |
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
307 |
if (new_player != PLAYER_SPECTATOR) { |
4346
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
308 |
if (HASBIT(t->have_ratings, old_player)) { |
4260
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
309 |
if (HASBIT(t->have_ratings, new_player)) { |
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
310 |
// use max of the two ratings. |
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
311 |
t->ratings[new_player] = max(t->ratings[new_player], t->ratings[old_player]); |
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
312 |
} else { |
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
313 |
SETBIT(t->have_ratings, new_player); |
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
314 |
t->ratings[new_player] = t->ratings[old_player]; |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
315 |
} |
4260
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
316 |
} |
5284
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
317 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
318 |
|
5284
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
319 |
/* Reset the ratings for the old player */ |
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
320 |
t->ratings[old_player] = 500; |
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
321 |
CLRBIT(t->have_ratings, old_player); |
0 | 322 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
323 |
|
0 | 324 |
{ |
325 |
int num_train = 0; |
|
326 |
int num_road = 0; |
|
327 |
int num_ship = 0; |
|
328 |
int num_aircraft = 0; |
|
329 |
Vehicle *v; |
|
330 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
331 |
/* Determine Ids for the new vehicles */ |
0 | 332 |
FOR_ALL_VEHICLES(v) { |
333 |
if (v->owner == new_player) { |
|
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
334 |
switch (v->type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
335 |
case VEH_TRAIN: if (IsFrontEngine(v)) num_train++; break; |
6857
60130753e595
(svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for
maedhros
parents:
6844
diff
changeset
|
336 |
case VEH_ROAD: if (IsRoadVehFront(v)) num_road++; break; |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
337 |
case VEH_SHIP: num_ship++; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
338 |
case VEH_AIRCRAFT: if (IsNormalAircraft(v)) num_aircraft++; break; |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
339 |
default: break; |
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
340 |
} |
0 | 341 |
} |
342 |
} |
|
343 |
||
344 |
FOR_ALL_VEHICLES(v) { |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
345 |
if (v->owner == old_player && IS_BYTE_INSIDE(v->type, VEH_TRAIN, VEH_AIRCRAFT + 1)) { |
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4845
diff
changeset
|
346 |
if (new_player == PLAYER_SPECTATOR) { |
0 | 347 |
DeleteWindowById(WC_VEHICLE_VIEW, v->index); |
348 |
DeleteWindowById(WC_VEHICLE_DETAILS, v->index); |
|
349 |
DeleteWindowById(WC_VEHICLE_ORDERS, v->index); |
|
6876
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
350 |
|
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
351 |
if (v->IsPrimaryVehicle() || (v->type == VEH_TRAIN && IsFreeWagon(v))) { |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
352 |
switch (v->type) { |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
353 |
default: NOT_REACHED(); |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
354 |
|
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
355 |
case VEH_TRAIN: { |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
356 |
Vehicle *u = v; |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
357 |
do { |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
358 |
Vehicle *next = GetNextVehicle(u); |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
359 |
DeleteVehicle(u); |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
360 |
u = next; |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
361 |
} while (u != NULL); |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
362 |
} break; |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
363 |
|
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
364 |
case VEH_ROAD: |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
365 |
case VEH_SHIP: |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
366 |
DeleteVehicle(v); |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
367 |
break; |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
368 |
|
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
369 |
case VEH_AIRCRAFT: |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
370 |
DeleteVehicleChain(v); |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
371 |
break; |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
372 |
} |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
373 |
} |
0 | 374 |
} else { |
375 |
v->owner = new_player; |
|
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6639
diff
changeset
|
376 |
v->group_id = DEFAULT_GROUP; |
4621
47100a78dbd3
(svn r6479) -Fix r6424: FS#348 Plane autoreplace glitch
bjarni
parents:
4549
diff
changeset
|
377 |
if (IsEngineCountable(v)) GetPlayer(new_player)->num_engines[v->engine_type]++; |
2989 | 378 |
switch (v->type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
379 |
case VEH_TRAIN: if (IsFrontEngine(v)) v->unitnumber = ++num_train; break; |
6857
60130753e595
(svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for
maedhros
parents:
6844
diff
changeset
|
380 |
case VEH_ROAD: if (IsRoadVehFront(v)) v->unitnumber = ++num_road; break; |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
381 |
case VEH_SHIP: v->unitnumber = ++num_ship; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
382 |
case VEH_AIRCRAFT: if (IsNormalAircraft(v)) v->unitnumber = ++num_aircraft; break; |
6621
441559124aea
(svn r9841) -Codechange: add a little more type strictness to the vehicle types.
rubidium
parents:
6620
diff
changeset
|
383 |
default: NOT_REACHED(); |
2989 | 384 |
} |
0 | 385 |
} |
386 |
} |
|
387 |
} |
|
388 |
} |
|
389 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
390 |
/* Change ownership of tiles */ |
0 | 391 |
{ |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
392 |
TileIndex tile = 0; |
0 | 393 |
do { |
394 |
ChangeTileOwner(tile, old_player, new_player); |
|
863
6a1444534f62
(svn r1344) Use MapSize[XY]() (or MapSize()/MapMax[XY]() where appropriate) instead of TILES_[XY]
tron
parents:
830
diff
changeset
|
395 |
} while (++tile != MapSize()); |
0 | 396 |
} |
397 |
||
5077
5a601eb01735
(svn r7138) -Fix: [vehicle list windows] fixed a rare crash where having some (not all) vehicle list windows open for a player, that goes bankrupt would crash the game
bjarni
parents:
5067
diff
changeset
|
398 |
/* Change color of existing windows */ |
5a601eb01735
(svn r7138) -Fix: [vehicle list windows] fixed a rare crash where having some (not all) vehicle list windows open for a player, that goes bankrupt would crash the game
bjarni
parents:
5067
diff
changeset
|
399 |
if (new_player != PLAYER_SPECTATOR) ChangeWindowOwner(old_player, new_player); |
0 | 400 |
|
401 |
_current_player = old; |
|
402 |
||
403 |
MarkWholeScreenDirty(); |
|
404 |
} |
|
405 |
||
6262
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
406 |
static void ChangeNetworkOwner(PlayerID current_player, PlayerID new_player) |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
407 |
{ |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
408 |
#ifdef ENABLE_NETWORK |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
409 |
if (!_networking) return; |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
410 |
|
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
411 |
if (current_player == _local_player) { |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
412 |
_network_playas = new_player; |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
413 |
SetLocalPlayer(new_player); |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
414 |
} |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
415 |
|
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
416 |
if (!_network_server) return; |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
417 |
|
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
418 |
/* The server has to handle all administrative issues, for example |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
419 |
* updating and notifying all clients of what has happened */ |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
420 |
NetworkTCPSocketHandler *cs; |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
421 |
NetworkClientInfo *ci = NetworkFindClientInfoFromIndex(NETWORK_SERVER_INDEX); |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
422 |
|
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
423 |
/* The server has just changed from player */ |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
424 |
if (current_player == ci->client_playas) { |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
425 |
ci->client_playas = new_player; |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
426 |
NetworkUpdateClientInfo(NETWORK_SERVER_INDEX); |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
427 |
} |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
428 |
|
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
429 |
/* Find all clients that were in control of this company, and mark them as new_player */ |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
430 |
FOR_ALL_CLIENTS(cs) { |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
431 |
ci = DEREF_CLIENT_INFO(cs); |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
432 |
if (current_player == ci->client_playas) { |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
433 |
ci->client_playas = new_player; |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
434 |
NetworkUpdateClientInfo(ci->client_index); |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
435 |
} |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
436 |
} |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
437 |
#endif /* ENABLE_NETWORK */ |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
438 |
} |
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
439 |
|
0 | 440 |
static void PlayersCheckBankrupt(Player *p) |
441 |
{ |
|
2475 | 442 |
PlayerID owner; |
200
03b8104d1479
(svn r201) -Fix: [1025836] Company values bigger dan int32 were put to negative
truelight
parents:
193
diff
changeset
|
443 |
int64 val; |
0 | 444 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
445 |
/* If the player has money again, it does not go bankrupt */ |
0 | 446 |
if (p->player_money >= 0) { |
447 |
p->quarters_of_bankrupcy = 0; |
|
448 |
return; |
|
449 |
} |
|
450 |
||
451 |
p->quarters_of_bankrupcy++; |
|
452 |
||
453 |
owner = p->index; |
|
454 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
455 |
switch (p->quarters_of_bankrupcy) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
456 |
case 2: |
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
457 |
AddNewsItem( (StringID)(owner | NB_BTROUBLE), |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
458 |
NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
459 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
460 |
case 3: { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
461 |
/* XXX - In multiplayer, should we ask other players if it wants to take |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
462 |
over when it is a human company? -- TrueLight */ |
4845
72bbb6e2694e
(svn r6771) -Codechange: Replace two macros with functions. IS_HUMAN_PLAYER and
Darkvater
parents:
4814
diff
changeset
|
463 |
if (IsHumanPlayer(owner)) { |
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
464 |
AddNewsItem( (StringID)(owner | NB_BTROUBLE), |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
465 |
NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
466 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
467 |
} |
0 | 468 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
469 |
/* Check if the company has any value.. if not, declare it bankrupt |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
470 |
* right now */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
471 |
val = CalculateCompanyValue(p); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
472 |
if (val > 0) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
473 |
p->bankrupt_value = val; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
474 |
p->bankrupt_asked = 1 << owner; // Don't ask the owner |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
475 |
p->bankrupt_timeout = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
476 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
477 |
} |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
478 |
/* Else, falltrue to case 4... */ |
0 | 479 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
480 |
case 4: { |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
481 |
/* Close everything the owner has open */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
482 |
DeletePlayerWindows(owner); |
0 | 483 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
484 |
/* Show bankrupt news */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
485 |
SetDParam(0, p->name_1); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
486 |
SetDParam(1, p->name_2); |
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
487 |
AddNewsItem( (StringID)(owner | NB_BBANKRUPT), NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
488 |
|
5067
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
489 |
if (IsHumanPlayer(owner)) { |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
490 |
/* XXX - If we are in offline mode, leave the player playing. Eg. there |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
491 |
* is no THE-END, otherwise mark the player as spectator to make sure |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
492 |
* he/she is no long in control of this company */ |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
493 |
if (!_networking) { |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
494 |
p->bankrupt_asked = 0xFF; |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
495 |
p->bankrupt_timeout = 0x456; |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
496 |
break; |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
497 |
} |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
498 |
|
6262
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
499 |
ChangeNetworkOwner(owner, PLAYER_SPECTATOR); |
5067
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
500 |
} |
687
0e42e732ad78
(svn r1128) -Fix: [Network] Going bankrupt of human-players was corrupted in networkgames
truelight
parents:
679
diff
changeset
|
501 |
|
5067
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
502 |
/* Remove the player */ |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
503 |
ChangeOwnershipOfPlayerItems(owner, PLAYER_SPECTATOR); |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
504 |
/* Register the player as not-active */ |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
505 |
p->is_active = false; |
2395
d1629f64d157
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2306
diff
changeset
|
506 |
|
5067
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
507 |
if (!IsHumanPlayer(owner) && (!_networking || _network_server) && _ai.enabled) |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
508 |
AI_PlayerDied(owner); |
0 | 509 |
} |
510 |
} |
|
511 |
} |
|
512 |
||
513 |
void DrawNewsBankrupcy(Window *w) |
|
514 |
{ |
|
515 |
Player *p; |
|
516 |
||
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
517 |
DrawNewsBorder(w); |
0 | 518 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
519 |
p = GetPlayer((PlayerID)GB(WP(w,news_d).ni->string_id, 0, 4)); |
0 | 520 |
DrawPlayerFace(p->face, p->player_color, 2, 23); |
5668
36b39f4a9032
(svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
peter1138
parents:
5665
diff
changeset
|
521 |
GfxFillRect(3, 23, 3 + 91, 23 + 118, PALETTE_TO_STRUCT_GREY | (1 << USE_COLORTABLE)); |
0 | 522 |
|
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
523 |
SetDParam(0, p->president_name_1); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
524 |
SetDParam(1, p->president_name_2); |
0 | 525 |
|
526 |
DrawStringMultiCenter(49, 148, STR_7058_PRESIDENT, 94); |
|
527 |
||
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
528 |
switch (WP(w,news_d).ni->string_id & 0xF0) { |
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
529 |
case NB_BTROUBLE: |
0 | 530 |
DrawStringCentered(w->width>>1, 1, STR_7056_TRANSPORT_COMPANY_IN_TROUBLE, 0); |
531 |
||
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
532 |
SetDParam(0, p->name_1); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
533 |
SetDParam(1, p->name_2); |
0 | 534 |
|
535 |
DrawStringMultiCenter( |
|
536 |
((w->width - 101) >> 1) + 98, |
|
537 |
90, |
|
538 |
STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED, |
|
539 |
w->width - 101); |
|
540 |
break; |
|
541 |
||
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
542 |
case NB_BMERGER: { |
0 | 543 |
int32 price; |
544 |
||
545 |
DrawStringCentered(w->width>>1, 1, STR_7059_TRANSPORT_COMPANY_MERGER, 0); |
|
546 |
COPY_IN_DPARAM(0,WP(w,news_d).ni->params, 2); |
|
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
547 |
SetDParam(2, p->name_1); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
548 |
SetDParam(3, p->name_2); |
0 | 549 |
price = WP(w,news_d).ni->params[2]; |
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
550 |
SetDParam(4, price); |
0 | 551 |
DrawStringMultiCenter( |
552 |
((w->width - 101) >> 1) + 98, |
|
553 |
90, |
|
554 |
price==0 ? STR_707F_HAS_BEEN_TAKEN_OVER_BY : STR_705A_HAS_BEEN_SOLD_TO_FOR, |
|
555 |
w->width - 101); |
|
556 |
break; |
|
557 |
} |
|
558 |
||
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
559 |
case NB_BBANKRUPT: |
0 | 560 |
DrawStringCentered(w->width>>1, 1, STR_705C_BANKRUPT, 0); |
561 |
COPY_IN_DPARAM(0,WP(w,news_d).ni->params, 2); |
|
562 |
DrawStringMultiCenter( |
|
563 |
((w->width - 101) >> 1) + 98, |
|
564 |
90, |
|
565 |
STR_705D_HAS_BEEN_CLOSED_DOWN_BY, |
|
566 |
w->width - 101); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
567 |
break; |
0 | 568 |
|
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
569 |
case NB_BNEWCOMPANY: |
0 | 570 |
DrawStringCentered(w->width>>1, 1, STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED, 0); |
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
571 |
SetDParam(0, p->name_1); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
572 |
SetDParam(1, p->name_2); |
0 | 573 |
COPY_IN_DPARAM(2,WP(w,news_d).ni->params, 2); |
574 |
DrawStringMultiCenter( |
|
575 |
((w->width - 101) >> 1) + 98, |
|
576 |
90, |
|
577 |
STR_705F_STARTS_CONSTRUCTION_NEAR, |
|
578 |
w->width - 101); |
|
579 |
break; |
|
580 |
||
581 |
default: |
|
582 |
NOT_REACHED(); |
|
583 |
} |
|
584 |
} |
|
585 |
||
2436
7d5df545bd5d
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2425
diff
changeset
|
586 |
StringID GetNewsStringBankrupcy(const NewsItem *ni) |
0 | 587 |
{ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
588 |
const Player *p = GetPlayer((PlayerID)GB(ni->string_id, 0, 4)); |
0 | 589 |
|
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
590 |
switch (ni->string_id & 0xF0) { |
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
591 |
case NB_BTROUBLE: |
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
592 |
SetDParam(0, STR_7056_TRANSPORT_COMPANY_IN_TROUBLE); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
593 |
SetDParam(1, STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
594 |
SetDParam(2, p->name_1); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
595 |
SetDParam(3, p->name_2); |
0 | 596 |
return STR_02B6; |
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
597 |
case NB_BMERGER: |
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
598 |
SetDParam(0, STR_7059_TRANSPORT_COMPANY_MERGER); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
599 |
SetDParam(1, STR_705A_HAS_BEEN_SOLD_TO_FOR); |
0 | 600 |
COPY_IN_DPARAM(2,ni->params, 2); |
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
601 |
SetDParam(4, p->name_1); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
602 |
SetDParam(5, p->name_2); |
0 | 603 |
COPY_IN_DPARAM(6,ni->params + 2, 1); |
604 |
return STR_02B6; |
|
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
605 |
case NB_BBANKRUPT: |
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
606 |
SetDParam(0, STR_705C_BANKRUPT); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
607 |
SetDParam(1, STR_705D_HAS_BEEN_CLOSED_DOWN_BY); |
0 | 608 |
COPY_IN_DPARAM(2,ni->params, 2); |
609 |
return STR_02B6; |
|
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
610 |
case NB_BNEWCOMPANY: |
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
611 |
SetDParam(0, STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
612 |
SetDParam(1, STR_705F_STARTS_CONSTRUCTION_NEAR); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
613 |
SetDParam(2, p->name_1); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
614 |
SetDParam(3, p->name_2); |
0 | 615 |
COPY_IN_DPARAM(4,ni->params, 2); |
616 |
return STR_02B6; |
|
617 |
default: |
|
618 |
NOT_REACHED(); |
|
619 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
620 |
|
0 | 621 |
/* useless, but avoids compiler warning this way */ |
622 |
return 0; |
|
623 |
} |
|
624 |
||
6247 | 625 |
static void PlayersGenStatistics() |
0 | 626 |
{ |
627 |
Station *st; |
|
628 |
Player *p; |
|
629 |
||
630 |
FOR_ALL_STATIONS(st) { |
|
4346
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
631 |
_current_player = st->owner; |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
632 |
SET_EXPENSES_TYPE(EXPENSES_PROPERTY); |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
633 |
SubtractMoneyFromPlayer(_price.station_value >> 1); |
0 | 634 |
} |
635 |
||
636 |
if (!HASBIT(1<<0|1<<3|1<<6|1<<9, _cur_month)) |
|
637 |
return; |
|
638 |
||
639 |
FOR_ALL_PLAYERS(p) { |
|
640 |
if (p->is_active) { |
|
5426
d3d5733c5e3a
(svn r7630) -Fix: At the end of the quarter the old economy numbers were shifted up, and
Darkvater
parents:
5378
diff
changeset
|
641 |
memmove(&p->old_economy[1], &p->old_economy[0], sizeof(p->old_economy) - sizeof(p->old_economy[0])); |
d3d5733c5e3a
(svn r7630) -Fix: At the end of the quarter the old economy numbers were shifted up, and
Darkvater
parents:
5378
diff
changeset
|
642 |
p->old_economy[0] = p->cur_economy; |
0 | 643 |
memset(&p->cur_economy, 0, sizeof(p->cur_economy)); |
644 |
||
5426
d3d5733c5e3a
(svn r7630) -Fix: At the end of the quarter the old economy numbers were shifted up, and
Darkvater
parents:
5378
diff
changeset
|
645 |
if (p->num_valid_stat_ent != 24) p->num_valid_stat_ent++; |
0 | 646 |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
647 |
UpdateCompanyRatingAndValue(p, true); |
0 | 648 |
PlayersCheckBankrupt(p); |
649 |
||
5426
d3d5733c5e3a
(svn r7630) -Fix: At the end of the quarter the old economy numbers were shifted up, and
Darkvater
parents:
5378
diff
changeset
|
650 |
if (p->block_preview != 0) p->block_preview--; |
0 | 651 |
} |
652 |
} |
|
653 |
||
654 |
InvalidateWindow(WC_INCOME_GRAPH, 0); |
|
655 |
InvalidateWindow(WC_OPERATING_PROFIT, 0); |
|
656 |
InvalidateWindow(WC_DELIVERED_CARGO, 0); |
|
657 |
InvalidateWindow(WC_PERFORMANCE_HISTORY, 0); |
|
658 |
InvalidateWindow(WC_COMPANY_VALUE, 0); |
|
659 |
InvalidateWindow(WC_COMPANY_LEAGUE, 0); |
|
660 |
} |
|
661 |
||
662 |
static void AddSingleInflation(int32 *value, uint16 *frac, int32 amt) |
|
663 |
{ |
|
6119 | 664 |
int64 tmp = (int64)*value * amt + *frac; |
665 |
*frac = GB(tmp, 0, 16); |
|
666 |
*value += tmp >> 16; |
|
0 | 667 |
} |
668 |
||
6247 | 669 |
static void AddInflation() |
0 | 670 |
{ |
6119 | 671 |
/* Approximation for (100 + infl_amount)% ** (1 / 12) - 100% |
672 |
* scaled by 65536 |
|
673 |
* 12 -> months per year |
|
674 |
* This is only a good approxiamtion for small values |
|
675 |
*/ |
|
0 | 676 |
int32 inf = _economy.infl_amount * 54; |
677 |
||
6119 | 678 |
for (uint i = 0; i != NUM_PRICES; i++) { |
2639 | 679 |
AddSingleInflation((int32*)&_price + i, _price_frac + i, inf); |
0 | 680 |
} |
681 |
||
682 |
_economy.max_loan_unround += BIGMULUS(_economy.max_loan_unround, inf, 16); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
683 |
|
0 | 684 |
if (_economy.max_loan + 50000 <= _economy.max_loan_unround) |
685 |
_economy.max_loan += 50000; |
|
686 |
||
687 |
inf = _economy.infl_amount_pr * 54; |
|
6350
04b19f551aec
(svn r9388) -Codechange: variable scope and type, and standardify all CargoID loops.
peter1138
parents:
6315
diff
changeset
|
688 |
for (CargoID i = 0; i < NUM_CARGO; i++) { |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
689 |
AddSingleInflation( |
1884
804ff5f94ed0
(svn r2390) - Codechange: Fix some warnings on GCC 4.0.0
hackykid
parents:
1881
diff
changeset
|
690 |
(int32*)_cargo_payment_rates + i, |
0 | 691 |
_cargo_payment_rates_frac + i, |
692 |
inf |
|
693 |
); |
|
694 |
} |
|
695 |
||
696 |
InvalidateWindowClasses(WC_BUILD_VEHICLE); |
|
1098
dac6a13ff91d
(svn r1599) fix: autoreplace window now updates when inflation alters prices
bjarni
parents:
1093
diff
changeset
|
697 |
InvalidateWindowClasses(WC_REPLACE_VEHICLE); |
0 | 698 |
InvalidateWindowClasses(WC_VEHICLE_DETAILS); |
699 |
InvalidateWindow(WC_PAYMENT_RATES, 0); |
|
700 |
} |
|
701 |
||
6247 | 702 |
static void PlayersPayInterest() |
0 | 703 |
{ |
2548
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2544
diff
changeset
|
704 |
const Player* p; |
0 | 705 |
int interest = _economy.interest_rate * 54; |
706 |
||
707 |
FOR_ALL_PLAYERS(p) { |
|
2639 | 708 |
if (!p->is_active) continue; |
0 | 709 |
|
710 |
_current_player = p->index; |
|
711 |
SET_EXPENSES_TYPE(EXPENSES_LOAN_INT); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
712 |
|
0 | 713 |
SubtractMoneyFromPlayer(BIGMULUS(p->current_loan, interest, 16)); |
714 |
||
715 |
SET_EXPENSES_TYPE(EXPENSES_OTHER); |
|
716 |
SubtractMoneyFromPlayer(_price.station_value >> 2); |
|
717 |
} |
|
718 |
} |
|
719 |
||
6247 | 720 |
static void HandleEconomyFluctuations() |
0 | 721 |
{ |
2639 | 722 |
if (_opt.diff.economy == 0) return; |
0 | 723 |
|
724 |
if (--_economy.fluct == 0) { |
|
2642 | 725 |
_economy.fluct = -(int)GB(Random(), 0, 2); |
0 | 726 |
AddNewsItem(STR_7073_WORLD_RECESSION_FINANCIAL, NEWS_FLAGS(NM_NORMAL,0,NT_ECONOMY,0), 0, 0); |
727 |
} else if (_economy.fluct == -12) { |
|
2642 | 728 |
_economy.fluct = GB(Random(), 0, 8) + 312; |
0 | 729 |
AddNewsItem(STR_7074_RECESSION_OVER_UPTURN_IN, NEWS_FLAGS(NM_NORMAL,0,NT_ECONOMY,0), 0, 0); |
730 |
} |
|
731 |
} |
|
732 |
||
733 |
static byte _price_category[NUM_PRICES] = { |
|
734 |
0, 2, 2, 2, 2, 2, 2, 2, |
|
735 |
2, 2, 2, 2, 2, 2, 2, 2, |
|
736 |
2, 2, 2, 2, 2, 2, 2, 2, |
|
737 |
2, 2, 2, 2, 2, 2, 2, 2, |
|
738 |
2, 2, 2, 2, 2, 2, 2, 2, |
|
739 |
2, 2, 1, 1, 1, 1, 1, 1, |
|
740 |
2, |
|
741 |
}; |
|
742 |
||
743 |
static const int32 _price_base[NUM_PRICES] = { |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
744 |
100, ///< station_value |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
745 |
100, ///< build_rail |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
746 |
95, ///< build_road |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
747 |
65, ///< build_signals |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
748 |
275, ///< build_bridge |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
749 |
600, ///< build_train_depot |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
750 |
500, ///< build_road_depot |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
751 |
700, ///< build_ship_depot |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
752 |
450, ///< build_tunnel |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
753 |
200, ///< train_station_track |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
754 |
180, ///< train_station_length |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
755 |
600, ///< build_airport |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
756 |
200, ///< build_bus_station |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
757 |
200, ///< build_truck_station |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
758 |
350, ///< build_dock |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
759 |
400000, ///< build_railvehicle |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
760 |
2000, ///< build_railwagon |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
761 |
700000, ///< aircraft_base |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
762 |
14000, ///< roadveh_base |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
763 |
65000, ///< ship_base |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
764 |
20, ///< build_trees |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
765 |
250, ///< terraform |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
766 |
20, ///< clear_1 |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
767 |
40, ///< purchase_land |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
768 |
200, ///< clear_2 |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
769 |
500, ///< clear_3 |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
770 |
20, ///< remove_trees |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
771 |
-70, ///< remove_rail |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
772 |
10, ///< remove_signals |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
773 |
50, ///< clear_bridge |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
774 |
80, ///< remove_train_depot |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
775 |
80, ///< remove_road_depot |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
776 |
90, ///< remove_ship_depot |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
777 |
30, ///< clear_tunnel |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
778 |
10000, ///< clear_water |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
779 |
50, ///< remove_rail_station |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
780 |
30, ///< remove_airport |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
781 |
50, ///< remove_bus_station |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
782 |
50, ///< remove_truck_station |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
783 |
55, ///< remove_dock |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
784 |
1600, ///< remove_house |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
785 |
40, ///< remove_road |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
786 |
5600, ///< running_rail[0] railroad |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
787 |
5200, ///< running_rail[1] monorail |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
788 |
4800, ///< running_rail[2] maglev |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
789 |
9600, ///< aircraft_running |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
790 |
1600, ///< roadveh_running |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
791 |
5600, ///< ship_running |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
792 |
1000000, ///< build_industry |
0 | 793 |
}; |
794 |
||
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
795 |
static byte price_base_multiplier[NUM_PRICES]; |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
796 |
|
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
797 |
/** |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
798 |
* Reset changes to the price base multipliers. |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
799 |
*/ |
6247 | 800 |
void ResetPriceBaseMultipliers() |
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
801 |
{ |
2508
1926793f2977
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
802 |
uint i; |
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
803 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
804 |
/* 8 means no multiplier. */ |
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
805 |
for (i = 0; i < NUM_PRICES; i++) |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
806 |
price_base_multiplier[i] = 8; |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
807 |
} |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
808 |
|
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
809 |
/** |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
810 |
* Change a price base by the given factor. |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
811 |
* The price base is altered by factors of two, with an offset of 8. |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
812 |
* NewBaseCost = OldBaseCost * 2^(n-8) |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
813 |
* @param price Index of price base to change. |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
814 |
* @param factor Amount to change by. |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
815 |
*/ |
2508
1926793f2977
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
816 |
void SetPriceBaseMultiplier(uint price, byte factor) |
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
817 |
{ |
2508
1926793f2977
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
818 |
assert(price < NUM_PRICES); |
1926793f2977
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
819 |
price_base_multiplier[price] = factor; |
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
820 |
} |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
821 |
|
6247 | 822 |
void StartupEconomy() |
0 | 823 |
{ |
824 |
int i; |
|
825 |
||
826 |
assert(sizeof(_price) == NUM_PRICES * sizeof(int32)); |
|
827 |
||
2952 | 828 |
for (i = 0; i != NUM_PRICES; i++) { |
0 | 829 |
int32 price = _price_base[i]; |
830 |
if (_price_category[i] != 0) { |
|
831 |
uint mod = _price_category[i] == 1 ? _opt.diff.vehicle_costs : _opt.diff.construction_cost; |
|
832 |
if (mod < 1) { |
|
833 |
price = price * 3 >> 2; |
|
834 |
} else if (mod > 1) { |
|
835 |
price = price * 9 >> 3; |
|
836 |
} |
|
837 |
} |
|
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
838 |
if (price_base_multiplier[i] > 8) { |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
839 |
price <<= price_base_multiplier[i] - 8; |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
840 |
} else { |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
841 |
price >>= 8 - price_base_multiplier[i]; |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
842 |
} |
0 | 843 |
((int32*)&_price)[i] = price; |
844 |
_price_frac[i] = 0; |
|
845 |
} |
|
846 |
||
847 |
_economy.interest_rate = _opt.diff.initial_interest; |
|
848 |
_economy.infl_amount = _opt.diff.initial_interest; |
|
849 |
_economy.infl_amount_pr = max(0, _opt.diff.initial_interest - 1); |
|
850 |
_economy.max_loan_unround = _economy.max_loan = _opt.diff.max_loan * 1000; |
|
2150
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2070
diff
changeset
|
851 |
_economy.fluct = GB(Random(), 0, 8) + 168; |
0 | 852 |
} |
853 |
||
2630 | 854 |
Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode) |
0 | 855 |
{ |
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1962
diff
changeset
|
856 |
TileIndex tile; |
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1962
diff
changeset
|
857 |
TileIndex tile2; |
0 | 858 |
Pair tp; |
859 |
||
2272
8b32b48b8579
(svn r2794) Fix a comment and get rid of some parentheses using DeMorgan's law
tron
parents:
2261
diff
changeset
|
860 |
/* if mode is false, use the singular form */ |
6091
c8827d9ae04a
(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:
5998
diff
changeset
|
861 |
const CargoSpec *cs = GetCargo(s->cargo_type); |
c8827d9ae04a
(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:
5998
diff
changeset
|
862 |
SetDParam(0, mode ? cs->name_plural : cs->name); |
0 | 863 |
|
864 |
if (s->age < 12) { |
|
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
865 |
if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL) { |
2070
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
866 |
SetDParam(1, STR_INDUSTRY); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
867 |
SetDParam(2, s->from); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
868 |
tile = GetIndustry(s->from)->xy; |
0 | 869 |
|
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
870 |
if (cs->town_effect != TE_GOODS && cs->town_effect != TE_FOOD) { |
2070
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
871 |
SetDParam(4, STR_INDUSTRY); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
872 |
SetDParam(5, s->to); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
873 |
tile2 = GetIndustry(s->to)->xy; |
0 | 874 |
} else { |
2070
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
875 |
SetDParam(4, STR_TOWN); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
876 |
SetDParam(5, s->to); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
877 |
tile2 = GetTown(s->to)->xy; |
0 | 878 |
} |
879 |
} else { |
|
2070
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
880 |
SetDParam(1, STR_TOWN); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
881 |
SetDParam(2, s->from); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
882 |
tile = GetTown(s->from)->xy; |
0 | 883 |
|
2070
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
884 |
SetDParam(4, STR_TOWN); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
885 |
SetDParam(5, s->to); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
886 |
tile2 = GetTown(s->to)->xy; |
0 | 887 |
} |
888 |
} else { |
|
2070
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
889 |
SetDParam(1, s->from); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
890 |
tile = GetStation(s->from)->xy; |
0 | 891 |
|
2070
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
892 |
SetDParam(2, s->to); |
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
893 |
tile2 = GetStation(s->to)->xy; |
0 | 894 |
} |
895 |
||
896 |
tp.a = tile; |
|
897 |
tp.b = tile2; |
|
898 |
||
899 |
return tp; |
|
900 |
} |
|
901 |
||
5378
5c26eb069095
(svn r7563) -Fix (FS#468): removing towns in the scenario editor could leave subsidies with that town as source/destination, resulting in an assertion when displaying the Subsidies Window.
rubidium
parents:
5376
diff
changeset
|
902 |
void DeleteSubsidyWithTown(TownID index) |
5c26eb069095
(svn r7563) -Fix (FS#468): removing towns in the scenario editor could leave subsidies with that town as source/destination, resulting in an assertion when displaying the Subsidies Window.
rubidium
parents:
5376
diff
changeset
|
903 |
{ |
5c26eb069095
(svn r7563) -Fix (FS#468): removing towns in the scenario editor could leave subsidies with that town as source/destination, resulting in an assertion when displaying the Subsidies Window.
rubidium
parents:
5376
diff
changeset
|
904 |
Subsidy *s; |
5c26eb069095
(svn r7563) -Fix (FS#468): removing towns in the scenario editor could leave subsidies with that town as source/destination, resulting in an assertion when displaying the Subsidies Window.
rubidium
parents:
5376
diff
changeset
|
905 |
|
5c26eb069095
(svn r7563) -Fix (FS#468): removing towns in the scenario editor could leave subsidies with that town as source/destination, resulting in an assertion when displaying the Subsidies Window.
rubidium
parents:
5376
diff
changeset
|
906 |
for (s = _subsidies; s != endof(_subsidies); s++) { |
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
907 |
if (s->cargo_type != CT_INVALID && s->age < 12) { |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
908 |
const CargoSpec *cs = GetCargo(s->cargo_type); |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
909 |
if (((cs->town_effect == TE_PASSENGERS || cs->town_effect == TE_MAIL) && (index == s->from || index == s->to)) || |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
910 |
((cs->town_effect == TE_GOODS || cs->town_effect == TE_FOOD) && index == s->to)) { |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
911 |
s->cargo_type = CT_INVALID; |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
912 |
} |
5378
5c26eb069095
(svn r7563) -Fix (FS#468): removing towns in the scenario editor could leave subsidies with that town as source/destination, resulting in an assertion when displaying the Subsidies Window.
rubidium
parents:
5376
diff
changeset
|
913 |
} |
5c26eb069095
(svn r7563) -Fix (FS#468): removing towns in the scenario editor could leave subsidies with that town as source/destination, resulting in an assertion when displaying the Subsidies Window.
rubidium
parents:
5376
diff
changeset
|
914 |
} |
5c26eb069095
(svn r7563) -Fix (FS#468): removing towns in the scenario editor could leave subsidies with that town as source/destination, resulting in an assertion when displaying the Subsidies Window.
rubidium
parents:
5376
diff
changeset
|
915 |
} |
5c26eb069095
(svn r7563) -Fix (FS#468): removing towns in the scenario editor could leave subsidies with that town as source/destination, resulting in an assertion when displaying the Subsidies Window.
rubidium
parents:
5376
diff
changeset
|
916 |
|
4330
cf31daa8b321
(svn r6005) -Cleanup: introduce IndustryID and use it
rubidium
parents:
4329
diff
changeset
|
917 |
void DeleteSubsidyWithIndustry(IndustryID index) |
0 | 918 |
{ |
919 |
Subsidy *s; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
920 |
|
2952 | 921 |
for (s = _subsidies; s != endof(_subsidies); s++) { |
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
922 |
if (s->cargo_type != CT_INVALID && s->age < 12) { |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
923 |
const CargoSpec *cs = GetCargo(s->cargo_type); |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
924 |
if (cs->town_effect != TE_PASSENGERS && cs->town_effect != TE_MAIL && |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
925 |
(index == s->from || (cs->town_effect != TE_GOODS && cs->town_effect != TE_FOOD && index == s->to))) { |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
926 |
s->cargo_type = CT_INVALID; |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
927 |
} |
0 | 928 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
929 |
} |
0 | 930 |
} |
931 |
||
4330
cf31daa8b321
(svn r6005) -Cleanup: introduce IndustryID and use it
rubidium
parents:
4329
diff
changeset
|
932 |
void DeleteSubsidyWithStation(StationID index) |
0 | 933 |
{ |
934 |
Subsidy *s; |
|
935 |
bool dirty = false; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
936 |
|
2952 | 937 |
for (s = _subsidies; s != endof(_subsidies); s++) { |
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
938 |
if (s->cargo_type != CT_INVALID && s->age >= 12 && |
0 | 939 |
(s->from == index || s->to == index)) { |
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
940 |
s->cargo_type = CT_INVALID; |
0 | 941 |
dirty = true; |
942 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
943 |
} |
0 | 944 |
|
945 |
if (dirty) |
|
946 |
InvalidateWindow(WC_SUBSIDIES_LIST, 0); |
|
947 |
} |
|
948 |
||
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
949 |
struct FoundRoute { |
0 | 950 |
uint distance; |
3344
fc86351d4641
(svn r4128) - CodeChange: Add proper semantics for CargoID for such variables instead of using the general byte-type.
Darkvater
parents:
3047
diff
changeset
|
951 |
CargoID cargo; |
0 | 952 |
void *from; |
953 |
void *to; |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
954 |
}; |
0 | 955 |
|
956 |
static void FindSubsidyPassengerRoute(FoundRoute *fr) |
|
957 |
{ |
|
958 |
Town *from,*to; |
|
959 |
||
960 |
fr->distance = (uint)-1; |
|
961 |
||
4356
ec4e13f21cd0
(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
|
962 |
fr->from = from = GetRandomTown(); |
ec4e13f21cd0
(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
|
963 |
if (from == NULL || from->population < 400) return; |
0 | 964 |
|
4356
ec4e13f21cd0
(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
|
965 |
fr->to = to = GetRandomTown(); |
ec4e13f21cd0
(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
|
966 |
if (from == to || to == NULL || to->population < 400 || to->pct_pass_transported > 42) |
0 | 967 |
return; |
968 |
||
1245
3822f77cbc53
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1098
diff
changeset
|
969 |
fr->distance = DistanceManhattan(from->xy, to->xy); |
0 | 970 |
} |
971 |
||
972 |
static void FindSubsidyCargoRoute(FoundRoute *fr) |
|
973 |
{ |
|
974 |
Industry *i; |
|
6636
fec086b5c340
(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:
6635
diff
changeset
|
975 |
const IndustrySpec *ind; |
0 | 976 |
int trans, total; |
3344
fc86351d4641
(svn r4128) - CodeChange: Add proper semantics for CargoID for such variables instead of using the general byte-type.
Darkvater
parents:
3047
diff
changeset
|
977 |
CargoID cargo; |
0 | 978 |
|
979 |
fr->distance = (uint)-1; |
|
980 |
||
4356
ec4e13f21cd0
(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
|
981 |
fr->from = i = GetRandomIndustry(); |
ec4e13f21cd0
(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
|
982 |
if (i == NULL) return; |
6636
fec086b5c340
(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:
6635
diff
changeset
|
983 |
ind = GetIndustrySpec(i->type); |
0 | 984 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
985 |
/* Randomize cargo type */ |
6636
fec086b5c340
(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:
6635
diff
changeset
|
986 |
if (HASBIT(Random(), 0) && ind->produced_cargo[1] != CT_INVALID) { |
fec086b5c340
(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:
6635
diff
changeset
|
987 |
cargo = ind->produced_cargo[1]; |
6819
f986f54e2660
(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:
6773
diff
changeset
|
988 |
trans = i->last_month_pct_transported[1]; |
f986f54e2660
(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:
6773
diff
changeset
|
989 |
total = i->last_month_production[1]; |
0 | 990 |
} else { |
6636
fec086b5c340
(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:
6635
diff
changeset
|
991 |
cargo = ind->produced_cargo[0]; |
6819
f986f54e2660
(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:
6773
diff
changeset
|
992 |
trans = i->last_month_pct_transported[0]; |
f986f54e2660
(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:
6773
diff
changeset
|
993 |
total = i->last_month_production[0]; |
0 | 994 |
} |
995 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
996 |
/* Quit if no production in this industry |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
997 |
* or if the cargo type is passengers |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
998 |
* or if the pct transported is already large enough */ |
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
999 |
if (total == 0 || trans > 42 || cargo == CT_INVALID) return; |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1000 |
|
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1001 |
const CargoSpec *cs = GetCargo(cargo); |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1002 |
if (cs->town_effect == TE_PASSENGERS) return; |
0 | 1003 |
|
1004 |
fr->cargo = cargo; |
|
1005 |
||
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1006 |
if (cs->town_effect == TE_GOODS || cs->town_effect == TE_FOOD) { |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1007 |
/* The destination is a town */ |
4356
ec4e13f21cd0
(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
|
1008 |
Town *t = GetRandomTown(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1009 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1010 |
/* Only want big towns */ |
4356
ec4e13f21cd0
(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
|
1011 |
if (t == NULL || t->population < 900) return; |
4346
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1012 |
|
1245
3822f77cbc53
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1098
diff
changeset
|
1013 |
fr->distance = DistanceManhattan(i->xy, t->xy); |
0 | 1014 |
fr->to = t; |
1015 |
} else { |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1016 |
/* The destination is an industry */ |
4356
ec4e13f21cd0
(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
|
1017 |
Industry *i2 = GetRandomIndustry(); |
6636
fec086b5c340
(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:
6635
diff
changeset
|
1018 |
if (i2 == NULL) { |
fec086b5c340
(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:
6635
diff
changeset
|
1019 |
return; |
fec086b5c340
(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:
6635
diff
changeset
|
1020 |
} |
fec086b5c340
(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:
6635
diff
changeset
|
1021 |
|
fec086b5c340
(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:
6635
diff
changeset
|
1022 |
ind = GetIndustrySpec(i2->type); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1023 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1024 |
/* The industry must accept the cargo */ |
6636
fec086b5c340
(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:
6635
diff
changeset
|
1025 |
if (i == i2 || |
fec086b5c340
(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:
6635
diff
changeset
|
1026 |
(cargo != ind->accepts_cargo[0] && |
fec086b5c340
(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:
6635
diff
changeset
|
1027 |
cargo != ind->accepts_cargo[1] && |
fec086b5c340
(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:
6635
diff
changeset
|
1028 |
cargo != ind->accepts_cargo[2])) { |
0 | 1029 |
return; |
6636
fec086b5c340
(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:
6635
diff
changeset
|
1030 |
} |
1245
3822f77cbc53
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1098
diff
changeset
|
1031 |
fr->distance = DistanceManhattan(i->xy, i2->xy); |
0 | 1032 |
fr->to = i2; |
1033 |
} |
|
1034 |
} |
|
1035 |
||
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1036 |
static bool CheckSubsidyDuplicate(Subsidy *s) |
0 | 1037 |
{ |
2630 | 1038 |
const Subsidy* ss; |
0 | 1039 |
|
2639 | 1040 |
for (ss = _subsidies; ss != endof(_subsidies); ss++) { |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1041 |
if (s != ss && |
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1042 |
ss->from == s->from && |
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1043 |
ss->to == s->to && |
0 | 1044 |
ss->cargo_type == s->cargo_type) { |
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1045 |
s->cargo_type = CT_INVALID; |
0 | 1046 |
return true; |
1047 |
} |
|
1048 |
} |
|
1049 |
return false; |
|
1050 |
} |
|
1051 |
||
239 | 1052 |
|
6247 | 1053 |
static void SubsidyMonthlyHandler() |
0 | 1054 |
{ |
1055 |
Subsidy *s; |
|
1056 |
Pair pair; |
|
1057 |
Station *st; |
|
1058 |
uint n; |
|
1059 |
FoundRoute fr; |
|
1060 |
bool modified = false; |
|
1061 |
||
2952 | 1062 |
for (s = _subsidies; s != endof(_subsidies); s++) { |
1063 |
if (s->cargo_type == CT_INVALID) continue; |
|
0 | 1064 |
|
1065 |
if (s->age == 12-1) { |
|
1066 |
pair = SetupSubsidyDecodeParam(s, 1); |
|
1067 |
AddNewsItem(STR_202E_OFFER_OF_SUBSIDY_EXPIRED, NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), pair.a, pair.b); |
|
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1068 |
s->cargo_type = CT_INVALID; |
0 | 1069 |
modified = true; |
1070 |
} else if (s->age == 2*12-1) { |
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
863
diff
changeset
|
1071 |
st = GetStation(s->to); |
0 | 1072 |
if (st->owner == _local_player) { |
1073 |
pair = SetupSubsidyDecodeParam(s, 1); |
|
1074 |
AddNewsItem(STR_202F_SUBSIDY_WITHDRAWN_SERVICE, NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), pair.a, pair.b); |
|
1075 |
} |
|
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1076 |
s->cargo_type = CT_INVALID; |
0 | 1077 |
modified = true; |
1078 |
} else { |
|
1079 |
s->age++; |
|
1080 |
} |
|
1081 |
} |
|
1082 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1083 |
/* 25% chance to go on */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
1084 |
if (CHANCE16(1,4)) { |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1085 |
/* Find a free slot*/ |
0 | 1086 |
s = _subsidies; |
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1087 |
while (s->cargo_type != CT_INVALID) { |
0 | 1088 |
if (++s == endof(_subsidies)) |
1089 |
goto no_add; |
|
1090 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1091 |
|
0 | 1092 |
n = 1000; |
1093 |
do { |
|
1094 |
FindSubsidyPassengerRoute(&fr); |
|
1095 |
if (fr.distance <= 70) { |
|
1096 |
s->cargo_type = CT_PASSENGERS; |
|
1097 |
s->from = ((Town*)fr.from)->index; |
|
1098 |
s->to = ((Town*)fr.to)->index; |
|
1099 |
goto add_subsidy; |
|
1100 |
} |
|
1101 |
FindSubsidyCargoRoute(&fr); |
|
1102 |
if (fr.distance <= 70) { |
|
1103 |
s->cargo_type = fr.cargo; |
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
863
diff
changeset
|
1104 |
s->from = ((Industry*)fr.from)->index; |
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1105 |
{ |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1106 |
const CargoSpec *cs = GetCargo(fr.cargo); |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1107 |
s->to = (cs->town_effect == TE_GOODS || cs->town_effect == TE_FOOD) ? ((Town*)fr.to)->index : ((Industry*)fr.to)->index; |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1108 |
} |
0 | 1109 |
add_subsidy: |
1110 |
if (!CheckSubsidyDuplicate(s)) { |
|
1111 |
s->age = 0; |
|
1112 |
pair = SetupSubsidyDecodeParam(s, 0); |
|
1113 |
AddNewsItem(STR_2030_SERVICE_SUBSIDY_OFFERED, NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), pair.a, pair.b); |
|
1114 |
modified = true; |
|
1115 |
break; |
|
1116 |
} |
|
1117 |
} |
|
239 | 1118 |
} while (n--); |
0 | 1119 |
} |
1120 |
no_add:; |
|
1121 |
if (modified) |
|
1122 |
InvalidateWindow(WC_SUBSIDIES_LIST, 0); |
|
1123 |
} |
|
1124 |
||
1881
435d39bd6ee0
(svn r2387) - CodeChange: made the saveload code more readable and also removed the 'byte' saveload arrays which means you can save an array of more than 255 elements, or bigger structs than 255 bytes. This doesn't yet solve the problem that a chunk can be a maximum of 16384 big.
Darkvater
parents:
1797
diff
changeset
|
1125 |
static const SaveLoad _subsidies_desc[] = { |
4344
7e123fec5b0b
(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
|
1126 |
SLE_VAR(Subsidy, cargo_type, SLE_UINT8), |
7e123fec5b0b
(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
|
1127 |
SLE_VAR(Subsidy, age, SLE_UINT8), |
7e123fec5b0b
(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
|
1128 |
SLE_CONDVAR(Subsidy, from, SLE_FILE_U8 | SLE_VAR_U16, 0, 4), |
7e123fec5b0b
(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
|
1129 |
SLE_CONDVAR(Subsidy, from, SLE_UINT16, 5, SL_MAX_VERSION), |
7e123fec5b0b
(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
|
1130 |
SLE_CONDVAR(Subsidy, to, SLE_FILE_U8 | SLE_VAR_U16, 0, 4), |
7e123fec5b0b
(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
|
1131 |
SLE_CONDVAR(Subsidy, to, SLE_UINT16, 5, SL_MAX_VERSION), |
0 | 1132 |
SLE_END() |
1133 |
}; |
|
1134 |
||
6247 | 1135 |
static void Save_SUBS() |
0 | 1136 |
{ |
1137 |
int i; |
|
1138 |
Subsidy *s; |
|
1139 |
||
2952 | 1140 |
for (i = 0; i != lengthof(_subsidies); i++) { |
0 | 1141 |
s = &_subsidies[i]; |
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1142 |
if (s->cargo_type != CT_INVALID) { |
0 | 1143 |
SlSetArrayIndex(i); |
1144 |
SlObject(s, _subsidies_desc); |
|
1145 |
} |
|
1146 |
} |
|
1147 |
} |
|
1148 |
||
6247 | 1149 |
static void Load_SUBS() |
0 | 1150 |
{ |
1151 |
int index; |
|
1152 |
while ((index = SlIterateArray()) != -1) |
|
1153 |
SlObject(&_subsidies[index], _subsidies_desc); |
|
1154 |
} |
|
1155 |
||
3344
fc86351d4641
(svn r4128) - CodeChange: Add proper semantics for CargoID for such variables instead of using the general byte-type.
Darkvater
parents:
3047
diff
changeset
|
1156 |
int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type) |
0 | 1157 |
{ |
6091
c8827d9ae04a
(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:
5998
diff
changeset
|
1158 |
const CargoSpec *cs = GetCargo(cargo_type); |
0 | 1159 |
byte f; |
1160 |
||
6458
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1161 |
/* Use callback to calculate cargo profit, if available */ |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1162 |
if (HASBIT(cs->callback_mask, CBM_CARGO_PROFIT_CALC)) { |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1163 |
uint32 var18 = min(dist, 0xFFFF) | (min(num_pieces, 0xFF) << 16) | (transit_days << 24); |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1164 |
uint16 callback = GetCargoCallback(CBID_CARGO_PROFIT_CALC, 0, var18, cs); |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1165 |
if (callback != CALLBACK_FAILED) { |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1166 |
int result = GB(callback, 0, 14); |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1167 |
|
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1168 |
/* Simulate a 15 bit signed value */ |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1169 |
if (HASBIT(callback, 14)) result = 0x4000 - result; |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1170 |
|
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1171 |
/* "The result should be a signed multiplier that gets multiplied |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1172 |
* by the amount of cargo moved and the price factor, then gets |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1173 |
* divided by 8192." */ |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1174 |
return result * num_pieces * _cargo_payment_rates[cargo_type] / 8192; |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1175 |
} |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1176 |
} |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1177 |
|
0 | 1178 |
/* zero the distance if it's the bank and very short transport. */ |
6357
f0f5e7d1713c
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6350
diff
changeset
|
1179 |
if (_opt.landscape == LT_TEMPERATE && cs->label == 'VALU' && dist < 10) |
0 | 1180 |
dist = 0; |
1181 |
||
1182 |
f = 255; |
|
6091
c8827d9ae04a
(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:
5998
diff
changeset
|
1183 |
if (transit_days > cs->transit_days[0]) { |
c8827d9ae04a
(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:
5998
diff
changeset
|
1184 |
transit_days -= cs->transit_days[0]; |
0 | 1185 |
f -= transit_days; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1186 |
|
6091
c8827d9ae04a
(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:
5998
diff
changeset
|
1187 |
if (transit_days > cs->transit_days[1]) { |
c8827d9ae04a
(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:
5998
diff
changeset
|
1188 |
transit_days -= cs->transit_days[1]; |
0 | 1189 |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
1190 |
if (f < transit_days) { |
0 | 1191 |
f = 0; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
1192 |
} else { |
0 | 1193 |
f -= transit_days; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
1194 |
} |
0 | 1195 |
} |
1196 |
} |
|
1197 |
if (f < 31) f = 31; |
|
1198 |
||
6369
50323446966b
(svn r9427) -Codechange: remove redundant variable
peter1138
parents:
6357
diff
changeset
|
1199 |
return BIGMULSS(dist * f * num_pieces, _cargo_payment_rates[cargo_type], 21); |
0 | 1200 |
} |
1201 |
||
3344
fc86351d4641
(svn r4128) - CodeChange: Add proper semantics for CargoID for such variables instead of using the general byte-type.
Darkvater
parents:
3047
diff
changeset
|
1202 |
static void DeliverGoodsToIndustry(TileIndex xy, CargoID cargo_type, int num_pieces) |
0 | 1203 |
{ |
6635
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1204 |
Industry *best = NULL; |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1205 |
Industry *ind; |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1206 |
const IndustrySpec *indspec; |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1207 |
uint best_dist; |
6639
d9e4445b518d
(svn r9870) -Codechange: Silence two compiler warnings and give proper type to the "type" member of industry struct
belugas
parents:
6636
diff
changeset
|
1208 |
uint accepted_cargo_index = 0; ///< unlikely value, just for warning removing |
0 | 1209 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1210 |
/* Check if there's an industry close to the station that accepts the cargo |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1211 |
* XXX - Think of something better to |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1212 |
* 1) Only deliver to industries which are withing the catchment radius |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1213 |
* 2) Distribute between industries if more then one is present */ |
6635
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1214 |
best_dist = (_patches.station_spread + 8) * 2; |
830
36c1366367e4
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
820
diff
changeset
|
1215 |
FOR_ALL_INDUSTRIES(ind) { |
6635
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1216 |
indspec = GetIndustrySpec(ind->type); |
6639
d9e4445b518d
(svn r9870) -Codechange: Silence two compiler warnings and give proper type to the "type" member of industry struct
belugas
parents:
6636
diff
changeset
|
1217 |
uint i; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
1218 |
|
6635
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1219 |
if (indspec->produced_cargo[0] == CT_INVALID) continue; |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1220 |
|
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1221 |
for (i = 0; i < lengthof(indspec->accepts_cargo); i++) { |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1222 |
if (cargo_type == indspec->accepts_cargo[i] && |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1223 |
(indspec->input_cargo_multiplier[i][0] != 0 || indspec->input_cargo_multiplier[i][1] != 0)) { |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1224 |
break; |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1225 |
} |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1226 |
} |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1227 |
|
6639
d9e4445b518d
(svn r9870) -Codechange: Silence two compiler warnings and give proper type to the "type" member of industry struct
belugas
parents:
6636
diff
changeset
|
1228 |
/* Check if matching cargo has been found */ |
6635
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1229 |
if (i == lengthof(indspec->accepts_cargo)) continue; |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1230 |
|
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1231 |
uint dist = DistanceManhattan(ind->xy, xy); |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1232 |
|
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1233 |
if (dist < best_dist) { |
0 | 1234 |
best = ind; |
6635
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1235 |
best_dist = dist; |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1236 |
accepted_cargo_index = i; |
0 | 1237 |
} |
1238 |
} |
|
1239 |
||
1240 |
/* Found one? */ |
|
1241 |
if (best != NULL) { |
|
6635
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1242 |
indspec = GetIndustrySpec(best->type); |
0 | 1243 |
best->was_cargo_delivered = true; |
6635
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1244 |
best->cargo_waiting[0] = min(best->cargo_waiting[0] + (num_pieces * indspec->input_cargo_multiplier[accepted_cargo_index][0] / 256), 0xFFFF); |
73064d1771ed
(svn r9866) -Codechange: remove the technical one-input-cargo-creates-one-output-cargo limit in the factories, sawmills, steelmills and the ones I'm forgetting to mention right now. Use of this functionality will come later.
rubidium
parents:
6621
diff
changeset
|
1245 |
best->cargo_waiting[1] = min(best->cargo_waiting[1] + (num_pieces * indspec->input_cargo_multiplier[accepted_cargo_index][1] / 256), 0xFFFF); |
0 | 1246 |
} |
1247 |
} |
|
1248 |
||
3344
fc86351d4641
(svn r4128) - CodeChange: Add proper semantics for CargoID for such variables instead of using the general byte-type.
Darkvater
parents:
3047
diff
changeset
|
1249 |
static bool CheckSubsidised(Station *from, Station *to, CargoID cargo_type) |
0 | 1250 |
{ |
1251 |
Subsidy *s; |
|
1252 |
TileIndex xy; |
|
1253 |
Pair pair; |
|
1254 |
Player *p; |
|
1255 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1256 |
/* check if there is an already existing subsidy that applies to us */ |
2951 | 1257 |
for (s = _subsidies; s != endof(_subsidies); s++) { |
0 | 1258 |
if (s->cargo_type == cargo_type && |
1259 |
s->age >= 12 && |
|
1260 |
s->from == from->index && |
|
2951 | 1261 |
s->to == to->index) { |
0 | 1262 |
return true; |
2951 | 1263 |
} |
0 | 1264 |
} |
1265 |
||
1266 |
/* check if there's a new subsidy that applies.. */ |
|
2951 | 1267 |
for (s = _subsidies; s != endof(_subsidies); s++) { |
0 | 1268 |
if (s->cargo_type == cargo_type && s->age < 12) { |
1269 |
/* Check distance from source */ |
|
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1270 |
const CargoSpec *cs = GetCargo(cargo_type); |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1271 |
if (cs->town_effect == TE_PASSENGERS || cs->town_effect == TE_MAIL) { |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
863
diff
changeset
|
1272 |
xy = GetTown(s->from)->xy; |
0 | 1273 |
} else { |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
863
diff
changeset
|
1274 |
xy = (GetIndustry(s->from))->xy; |
0 | 1275 |
} |
2951 | 1276 |
if (DistanceMax(xy, from->xy) > 9) continue; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1277 |
|
0 | 1278 |
/* Check distance from dest */ |
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1279 |
switch (cs->town_effect) { |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1280 |
case TE_PASSENGERS: |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1281 |
case TE_MAIL: |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1282 |
case TE_GOODS: |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1283 |
case TE_FOOD: |
2989 | 1284 |
xy = GetTown(s->to)->xy; |
1285 |
break; |
|
1286 |
||
1287 |
default: |
|
1288 |
xy = GetIndustry(s->to)->xy; |
|
1289 |
break; |
|
0 | 1290 |
} |
2951 | 1291 |
if (DistanceMax(xy, to->xy) > 9) continue; |
0 | 1292 |
|
1293 |
/* Found a subsidy, change the values to indicate that it's in use */ |
|
1294 |
s->age = 12; |
|
1295 |
s->from = from->index; |
|
1296 |
s->to = to->index; |
|
1297 |
||
1298 |
/* Add a news item */ |
|
1299 |
pair = SetupSubsidyDecodeParam(s, 0); |
|
1309
4403a69da4f8
(svn r1813) Declare functions implemented in strings.c in their own shiny new header (though i think some of these function don't belong into strings.c)
tron
parents:
1308
diff
changeset
|
1300 |
InjectDParam(2); |
0 | 1301 |
|
1962
8254df1b359b
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1935
diff
changeset
|
1302 |
p = GetPlayer(_current_player); |
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
1303 |
SetDParam(0, p->name_1); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
1304 |
SetDParam(1, p->name_2); |
0 | 1305 |
AddNewsItem( |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1306 |
STR_2031_SERVICE_SUBSIDY_AWARDED + _opt.diff.subsidy_multiplier, |
0 | 1307 |
NEWS_FLAGS(NM_NORMAL, NF_TILE, NT_SUBSIDIES, 0), |
2951 | 1308 |
pair.a, pair.b |
1309 |
); |
|
0 | 1310 |
|
1311 |
InvalidateWindow(WC_SUBSIDIES_LIST, 0); |
|
1312 |
return true; |
|
1313 |
} |
|
1314 |
} |
|
1315 |
return false; |
|
1316 |
} |
|
1317 |
||
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5668
diff
changeset
|
1318 |
static int32 DeliverGoods(int num_pieces, CargoID cargo_type, StationID source, StationID dest, TileIndex source_tile, byte days_in_transit) |
0 | 1319 |
{ |
1320 |
bool subsidised; |
|
1321 |
Station *s_from, *s_to; |
|
1322 |
int32 profit; |
|
1323 |
||
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
1324 |
assert(num_pieces > 0); |
0 | 1325 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1326 |
/* Update player statistics */ |
0 | 1327 |
{ |
1962
8254df1b359b
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1935
diff
changeset
|
1328 |
Player *p = GetPlayer(_current_player); |
0 | 1329 |
p->cur_economy.delivered_cargo += num_pieces; |
1330 |
SETBIT(p->cargo_types, cargo_type); |
|
1331 |
} |
|
1332 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1333 |
/* Get station pointers. */ |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
863
diff
changeset
|
1334 |
s_from = GetStation(source); |
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
863
diff
changeset
|
1335 |
s_to = GetStation(dest); |
0 | 1336 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1337 |
/* Check if a subsidy applies. */ |
0 | 1338 |
subsidised = CheckSubsidised(s_from, s_to, cargo_type); |
1339 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1340 |
/* Increase town's counter for some special goods types */ |
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1341 |
const CargoSpec *cs = GetCargo(cargo_type); |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1342 |
if (cs->town_effect == TE_FOOD) s_to->town->new_act_food += num_pieces; |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1343 |
if (cs->town_effect == TE_WATER) s_to->town->new_act_water += num_pieces; |
0 | 1344 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1345 |
/* Give the goods to the industry. */ |
0 | 1346 |
DeliverGoodsToIndustry(s_to->xy, cargo_type, num_pieces); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1347 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1348 |
/* Determine profit */ |
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5668
diff
changeset
|
1349 |
profit = GetTransportedGoodsIncome(num_pieces, DistanceManhattan(source_tile, s_to->xy), days_in_transit, cargo_type); |
0 | 1350 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1351 |
/* Modify profit if a subsidy is in effect */ |
0 | 1352 |
if (subsidised) { |
2989 | 1353 |
switch (_opt.diff.subsidy_multiplier) { |
3655
f91f341a613e
(svn r4570) - Fix: subsidy calculation was too high, broken in r3564
peter1138
parents:
3613
diff
changeset
|
1354 |
case 0: profit += profit >> 1; break; |
f91f341a613e
(svn r4570) - Fix: subsidy calculation was too high, broken in r3564
peter1138
parents:
3613
diff
changeset
|
1355 |
case 1: profit *= 2; break; |
f91f341a613e
(svn r4570) - Fix: subsidy calculation was too high, broken in r3564
peter1138
parents:
3613
diff
changeset
|
1356 |
case 2: profit *= 3; break; |
f91f341a613e
(svn r4570) - Fix: subsidy calculation was too high, broken in r3564
peter1138
parents:
3613
diff
changeset
|
1357 |
default: profit *= 4; break; |
0 | 1358 |
} |
1359 |
} |
|
1360 |
||
1361 |
return profit; |
|
1362 |
} |
|
1363 |
||
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1364 |
/** |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1365 |
* Performs the vehicle payment _and_ marks the vehicle to be unloaded. |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1366 |
* @param front_v the vehicle to be unloaded |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1367 |
*/ |
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1368 |
void VehiclePayment(Vehicle *front_v) |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1369 |
{ |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1370 |
int result = 0; |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1371 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1372 |
int profit = 0; |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1373 |
int total_veh_profit = 0; // accumulates the profit across the vehicle chain (used by trains) |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1374 |
int32 route_profit = 0; // the grand total amount for the route. A-D of transfer chain A-B-C-D |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1375 |
int virtual_profit = 0; // virtual profit of one vehicle element for feeder systems |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1376 |
int virtual_profit_total = 0; // virtual profit for entire vehicle chain |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1377 |
int total_cargo_feeder_share = 0; // the feeder cash amount for the goods being loaded/unloaded in this load step |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1378 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1379 |
int all_vehicles_cargo_feeder_share = front_v->cargo_feeder_share; // used to hold transfer value of complete vehicle chain - used by trains |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1380 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1381 |
StationID last_visited = front_v->last_station_visited; |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1382 |
Station *st = GetStation(last_visited); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1383 |
|
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1384 |
/* The owner of the train wants to be paid */ |
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1385 |
PlayerID old_player = _current_player; |
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1386 |
_current_player = front_v->owner; |
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1387 |
|
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1388 |
/* At this moment loading cannot be finished */ |
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1389 |
CLRBIT(front_v->vehicle_flags, VF_LOADING_FINISHED); |
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1390 |
|
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1391 |
/* Start unloading in at the first possible moment */ |
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1392 |
front_v->load_unload_time_rem = 1; |
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1393 |
|
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1394 |
for (Vehicle *v = front_v; v != NULL; v = v->next) { |
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1395 |
/* No cargo to unload */ |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1396 |
if (v->cargo_cap == 0 || v->cargo_count == 0) continue; |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1397 |
|
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1398 |
/* All cargo has already been paid for, no need to pay again */ |
6882
10263ea04cf3
(svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly.
rubidium
parents:
6879
diff
changeset
|
1399 |
if (v->cargo_count == v->cargo_paid_for) { |
10263ea04cf3
(svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly.
rubidium
parents:
6879
diff
changeset
|
1400 |
SETBIT(v->vehicle_flags, VF_CARGO_UNLOADING); |
10263ea04cf3
(svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly.
rubidium
parents:
6879
diff
changeset
|
1401 |
continue; |
10263ea04cf3
(svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly.
rubidium
parents:
6879
diff
changeset
|
1402 |
} |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1403 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1404 |
GoodsEntry *ge = &st->goods[v->cargo_type]; |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1405 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1406 |
if (v->cargo_source != last_visited && |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1407 |
HASBIT(ge->waiting_acceptance, 15) && |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1408 |
(front_v->current_order.flags & OF_TRANSFER) == 0) { |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1409 |
/* Deliver goods to the station */ |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1410 |
st->time_since_unload = 0; |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1411 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1412 |
/* handle end of route payment */ |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1413 |
profit += DeliverGoods(v->cargo_count - v->cargo_paid_for, v->cargo_type, v->cargo_source, last_visited, v->cargo_source_xy, v->cargo_days); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1414 |
v->cargo_paid_for = v->cargo_count; |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1415 |
route_profit = profit; // display amount paid for final route delivery, A-D of a chain A-B-C-D |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1416 |
total_veh_profit = profit - all_vehicles_cargo_feeder_share; // whole vehicle is not payed for transfers picked up earlier |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1417 |
total_cargo_feeder_share = -all_vehicles_cargo_feeder_share; // total of transfer fees in vehicle chain needs to be zero at end of unload |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1418 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1419 |
v->cargo_feeder_share = 0; // clear transfer cost per vehicle |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1420 |
result |= 1; |
6882
10263ea04cf3
(svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly.
rubidium
parents:
6879
diff
changeset
|
1421 |
|
10263ea04cf3
(svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly.
rubidium
parents:
6879
diff
changeset
|
1422 |
SETBIT(v->vehicle_flags, VF_CARGO_UNLOADING); |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1423 |
} else if (front_v->current_order.flags & (OF_UNLOAD | OF_TRANSFER)) { |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1424 |
if ((front_v->current_order.flags & OF_TRANSFER) != 0) { |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1425 |
virtual_profit = GetTransportedGoodsIncome( |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1426 |
v->cargo_count - v->cargo_paid_for, |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1427 |
/* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */ |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1428 |
DistanceManhattan(v->cargo_loaded_at_xy, GetStation(last_visited)->xy), |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1429 |
v->cargo_days, |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1430 |
v->cargo_type); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1431 |
|
6601
eac63c966a9e
(svn r9815) -Fix (r9761) [FS#769): transfers weren't accounted in the vehicle profits.
rubidium
parents:
6580
diff
changeset
|
1432 |
front_v->profit_this_year += virtual_profit; |
eac63c966a9e
(svn r9815) -Fix (r9761) [FS#769): transfers weren't accounted in the vehicle profits.
rubidium
parents:
6580
diff
changeset
|
1433 |
ge->feeder_profit += v->cargo_feeder_share + virtual_profit; // transfer cargo transfer fees to station |
eac63c966a9e
(svn r9815) -Fix (r9761) [FS#769): transfers weren't accounted in the vehicle profits.
rubidium
parents:
6580
diff
changeset
|
1434 |
total_cargo_feeder_share -= v->cargo_feeder_share; // accumulate deduction of feeder shares |
eac63c966a9e
(svn r9815) -Fix (r9761) [FS#769): transfers weren't accounted in the vehicle profits.
rubidium
parents:
6580
diff
changeset
|
1435 |
v->cargo_feeder_share = 0; // clear transfer cost |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1436 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1437 |
/* keep total of cargo unloaded (pending) for accurate cargoshare calculation on load */ |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1438 |
SB(ge->unload_pending, 0, 12, GB(ge->unload_pending, 0, 12) + v->cargo_count); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1439 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1440 |
virtual_profit_total += virtual_profit; // accumulate transfer profits for whole vehicle |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1441 |
v->cargo_paid_for = v->cargo_count; // record how much of the cargo has been paid for to eliminate double counting |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1442 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1443 |
result |= 2; |
6882
10263ea04cf3
(svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly.
rubidium
parents:
6879
diff
changeset
|
1444 |
|
10263ea04cf3
(svn r10125) -Fix [FS#865]: under some circumstances the wagons of a train didn't get loaded properly.
rubidium
parents:
6879
diff
changeset
|
1445 |
SETBIT(v->vehicle_flags, VF_CARGO_UNLOADING); |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1446 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1447 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1448 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1449 |
/* Ensure a negative total is only applied to the vehicle if there is value to reduce. */ |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1450 |
front_v->cargo_feeder_share = max(front_v->cargo_feeder_share + total_cargo_feeder_share, 0); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1451 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1452 |
if (virtual_profit_total > 0) { |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1453 |
ShowFeederIncomeAnimation(front_v->x_pos, front_v->y_pos, front_v->z_pos, virtual_profit_total); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1454 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1455 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1456 |
if (route_profit != 0) { |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1457 |
front_v->profit_this_year += total_veh_profit; |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1458 |
SubtractMoneyFromPlayer(-route_profit); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1459 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1460 |
if (IsLocalPlayer() && !PlayVehicleSound(front_v, VSE_LOAD_UNLOAD)) { |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1461 |
SndPlayVehicleFx(SND_14_CASHTILL, front_v); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1462 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1463 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1464 |
ShowCostOrIncomeAnimation(front_v->x_pos, front_v->y_pos, front_v->z_pos, -total_veh_profit); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1465 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1466 |
|
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1467 |
_current_player = old_player; |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1468 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1469 |
|
6580
8ba94d9af221
(svn r9794) -Codechange: refactor the question whether a vehicle can be loaded into LoadUnloadVehicle instead of duplicating it for each vehicle.
rubidium
parents:
6565
diff
changeset
|
1470 |
/** |
8ba94d9af221
(svn r9794) -Codechange: refactor the question whether a vehicle can be loaded into LoadUnloadVehicle instead of duplicating it for each vehicle.
rubidium
parents:
6565
diff
changeset
|
1471 |
* Loads/unload the vehicle if possible. |
8ba94d9af221
(svn r9794) -Codechange: refactor the question whether a vehicle can be loaded into LoadUnloadVehicle instead of duplicating it for each vehicle.
rubidium
parents:
6565
diff
changeset
|
1472 |
* @param v the vehicle to be (un)loaded |
6618
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1473 |
* @param cargo_left the amount of each cargo type that is |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1474 |
* virtually left on the platform to be |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1475 |
* picked up by another vehicle when all |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1476 |
* previous vehicles have loaded. |
6580
8ba94d9af221
(svn r9794) -Codechange: refactor the question whether a vehicle can be loaded into LoadUnloadVehicle instead of duplicating it for each vehicle.
rubidium
parents:
6565
diff
changeset
|
1477 |
*/ |
6618
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1478 |
static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) |
0 | 1479 |
{ |
6616
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1480 |
assert(v->current_order.type == OT_LOADING); |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1481 |
|
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1482 |
/* We have not waited enough time till the next round of loading/unloading */ |
6618
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1483 |
if (--v->load_unload_time_rem != 0) { |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1484 |
if (_patches.improved_load && HASBIT(v->current_order.flags, OFB_FULL_LOAD)) { |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1485 |
/* 'Reserve' this cargo for this vehicle, because we were first. */ |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1486 |
for (; v != NULL; v = v->next) { |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1487 |
if (v->cargo_cap != 0) cargo_left[v->cargo_type] -= v->cargo_cap - v->cargo_count; |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1488 |
} |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1489 |
} |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1490 |
return; |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1491 |
} |
6616
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1492 |
|
6844
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1493 |
if (v->type == VEH_TRAIN && !IsTileType(v->tile, MP_STATION)) { |
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1494 |
/* The train reversed in the station. Take the "easy" way |
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1495 |
* out and let the train just leave as it always did. */ |
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1496 |
SETBIT(v->vehicle_flags, VF_LOADING_FINISHED); |
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1497 |
return; |
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1498 |
} |
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1499 |
|
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1500 |
int unloading_time = 0; |
0 | 1501 |
Vehicle *u = v; |
1502 |
int result = 0; |
|
6620
4ecf216888d3
(svn r9840) -Fix (r9838): MSVC is complaining about signedness again (Belugas).
rubidium
parents:
6618
diff
changeset
|
1503 |
int cap; |
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1504 |
|
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1505 |
bool completely_empty = true; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1506 |
bool anything_unloaded = false; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1507 |
bool anything_loaded = false; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1508 |
uint32 cargo_not_full = 0; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1509 |
uint32 cargo_full = 0; |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1510 |
int total_cargo_feeder_share = 0; // the feeder cash amount for the goods being loaded/unloaded in this load step |
0 | 1511 |
|
1512 |
v->cur_speed = 0; |
|
5251
f4123dca9ec2
(svn r7377) -Fix (r7326): With gradual loading, make sure cargo is only paid for once, and always notify the station the vehicle was present. (Maedhros)
peter1138
parents:
5220
diff
changeset
|
1513 |
|
6198 | 1514 |
StationID last_visited = v->last_station_visited; |
1515 |
Station *st = GetStation(last_visited); |
|
1516 |
||
499 | 1517 |
for (; v != NULL; v = v->next) { |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1518 |
if (v->cargo_cap == 0) continue; |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1519 |
|
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1520 |
byte load_amount = EngInfo(v->engine_type)->load_amount; |
6227
e38177bd77c4
(svn r9029) -Fix (r7326): Only call the gradual loading amount callback if the bit for it is set in the vehicle's callbackmask.
maedhros
parents:
6199
diff
changeset
|
1521 |
if (_patches.gradual_loading && HASBIT(EngInfo(v->engine_type)->callbackmask, CBM_LOAD_AMOUNT)) { |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
1522 |
uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v); |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
1523 |
if (cb_load_amount != CALLBACK_FAILED) load_amount = cb_load_amount & 0xFF; |
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
1524 |
} |
2639 | 1525 |
|
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1526 |
GoodsEntry *ge = &st->goods[v->cargo_type]; |
6620
4ecf216888d3
(svn r9840) -Fix (r9838): MSVC is complaining about signedness again (Belugas).
rubidium
parents:
6618
diff
changeset
|
1527 |
int count = GB(ge->waiting_acceptance, 0, 12); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1528 |
|
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1529 |
if (HASBIT(v->vehicle_flags, VF_CARGO_UNLOADING)) { |
5251
f4123dca9ec2
(svn r7377) -Fix (r7326): With gradual loading, make sure cargo is only paid for once, and always notify the station the vehicle was present. (Maedhros)
peter1138
parents:
5220
diff
changeset
|
1530 |
uint16 amount_unloaded = _patches.gradual_loading ? min(v->cargo_count, load_amount) : v->cargo_count; |
f4123dca9ec2
(svn r7377) -Fix (r7326): With gradual loading, make sure cargo is only paid for once, and always notify the station the vehicle was present. (Maedhros)
peter1138
parents:
5220
diff
changeset
|
1531 |
|
2639 | 1532 |
if (v->cargo_source != last_visited && ge->waiting_acceptance & 0x8000 && !(u->current_order.flags & OF_TRANSFER)) { |
0 | 1533 |
result |= 1; |
2639 | 1534 |
} else if (u->current_order.flags & (OF_UNLOAD | OF_TRANSFER)) { |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1535 |
if (count == 0) { |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1536 |
/* No goods waiting at station */ |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1537 |
ge->enroute_time = v->cargo_days; |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1538 |
ge->enroute_from = v->cargo_source; |
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5668
diff
changeset
|
1539 |
ge->enroute_from_xy = v->cargo_source_xy; |
0 | 1540 |
} else { |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1541 |
/* Goods already waiting at station. Set counters to the worst value. */ |
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5668
diff
changeset
|
1542 |
if (v->cargo_days >= ge->enroute_time) ge->enroute_time = v->cargo_days; |
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5668
diff
changeset
|
1543 |
|
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5668
diff
changeset
|
1544 |
if (last_visited != ge->enroute_from) { |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1545 |
ge->enroute_from = v->cargo_source; |
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5668
diff
changeset
|
1546 |
ge->enroute_from_xy = v->cargo_source_xy; |
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5668
diff
changeset
|
1547 |
} |
0 | 1548 |
} |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1549 |
/* Update amount of waiting cargo. There is, however, no sense in |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1550 |
* updating the count variable because this vehicle will not be |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1551 |
* able to take the cargo. */ |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1552 |
SB(ge->waiting_acceptance, 0, 12, min(amount_unloaded + count, 0xFFF)); |
4814
8e8f3b110279
(svn r6738) - Fix (r2441): Only apply the virtual transfer profit if the order is a transfer order, rather than to any unload order. This fixes an issue where the AI doesn't know that a route is unprofitable.
peter1138
parents:
4701
diff
changeset
|
1553 |
|
6198 | 1554 |
/* if there is not enough to unload from pending, ensure it does not go -ve |
1555 |
* else deduct amount actually unloaded from unload_pending */ |
|
6199
707e6a239878
(svn r8979) -Fix (r8978): unsigned vs signed comparisons.
rubidium
parents:
6198
diff
changeset
|
1556 |
SB(ge->unload_pending, 0, 12, max(GB(ge->unload_pending, 0, 12) - amount_unloaded, 0U)); |
6198 | 1557 |
|
0 | 1558 |
result |= 2; |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1559 |
} else { |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1560 |
/* The order changed while unloading (unset unload/transfer) or the |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1561 |
* station does not accept goods anymore. */ |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1562 |
CLRBIT(v->vehicle_flags, VF_CARGO_UNLOADING); |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1563 |
continue; |
0 | 1564 |
} |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1565 |
|
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1566 |
/* Deliver goods to the station */ |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1567 |
st->time_since_unload = 0; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1568 |
|
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1569 |
unloading_time += amount_unloaded; |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1570 |
|
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1571 |
v->cargo_count -= amount_unloaded; |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1572 |
v->cargo_paid_for -= min(amount_unloaded, v->cargo_paid_for); |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1573 |
|
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1574 |
anything_unloaded = true; |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1575 |
if (_patches.gradual_loading && v->cargo_count != 0) { |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1576 |
completely_empty = false; |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1577 |
} else { |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1578 |
/* We have finished unloading (cargo count == 0) */ |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1579 |
CLRBIT(v->vehicle_flags, VF_CARGO_UNLOADING); |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1580 |
} |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1581 |
|
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1582 |
continue; |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1583 |
} |
5888
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5854
diff
changeset
|
1584 |
|
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5854
diff
changeset
|
1585 |
/* We cannot have paid for more cargo than there is on board. */ |
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5854
diff
changeset
|
1586 |
assert(v->cargo_paid_for <= v->cargo_count); |
5251
f4123dca9ec2
(svn r7377) -Fix (r7326): With gradual loading, make sure cargo is only paid for once, and always notify the station the vehicle was present. (Maedhros)
peter1138
parents:
5220
diff
changeset
|
1587 |
|
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1588 |
/* Do not pick up goods that we unloaded */ |
555
02df8a1b7f33
(svn r955) Replace uint16 for orders with struct Order
tron
parents:
543
diff
changeset
|
1589 |
if (u->current_order.flags & OF_UNLOAD) continue; |
0 | 1590 |
|
1591 |
/* update stats */ |
|
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1592 |
int t; |
2989 | 1593 |
switch (u->type) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1594 |
case VEH_TRAIN: t = u->u.rail.cached_max_speed; break; |
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1595 |
case VEH_ROAD: t = u->max_speed / 2; break; |
2989 | 1596 |
default: t = u->max_speed; break; |
1597 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1598 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1599 |
/* if last speed is 0, we treat that as if no vehicle has ever visited the station. */ |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1600 |
ge->days_since_pickup = 0; |
2989 | 1601 |
ge->last_speed = min(t, 255); |
4329
0e6e689f66e7
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4293
diff
changeset
|
1602 |
ge->last_age = _cur_year - v->build_year; |
0 | 1603 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1604 |
/* If there's goods waiting at the station, and the vehicle |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1605 |
* has capacity for it, load it on the vehicle. */ |
2504
5ae89f643cdc
(svn r3030) More work for GB/SB, this time concerning the waiting_acceptance attribute of stations
tron
parents:
2498
diff
changeset
|
1606 |
if (count != 0 && |
0 | 1607 |
(cap = v->cargo_cap - v->cargo_count) != 0) { |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1905
diff
changeset
|
1608 |
|
523
8871819c9afd
(svn r853) -Feature: Implement improved vehicle loading algorithm
tron
parents:
507
diff
changeset
|
1609 |
/* Skip loading this vehicle if another train/vehicle is already handling |
8871819c9afd
(svn r853) -Feature: Implement improved vehicle loading algorithm
tron
parents:
507
diff
changeset
|
1610 |
* the same cargo type at this station */ |
6698
611e079b7cd1
(svn r9930) -Fix (r9838): obiwan could cause vehicles to way a long time (2.5 years) at stations.
rubidium
parents:
6643
diff
changeset
|
1611 |
if (_patches.improved_load && cargo_left[v->cargo_type] <= 0) { |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1612 |
SETBIT(cargo_not_full, v->cargo_type); |
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1613 |
continue; |
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1614 |
} |
523
8871819c9afd
(svn r853) -Feature: Implement improved vehicle loading algorithm
tron
parents:
507
diff
changeset
|
1615 |
|
6618
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1616 |
if (cap > count) cap = count; |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1617 |
if (_patches.gradual_loading) cap = min(cap, load_amount); |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1618 |
if (_patches.improved_load) { |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1619 |
/* Don't load stuff that is already 'reserved' for other vehicles */ |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1620 |
cap = min(cargo_left[v->cargo_type], cap); |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1621 |
cargo_left[v->cargo_type] -= cap; |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1622 |
} |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1623 |
|
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1624 |
if (v->cargo_count == 0) TriggerVehicle(v, VEHICLE_TRIGGER_NEW_CARGO); |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1625 |
|
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1626 |
/* TODO: Regarding this, when we do gradual loading, we |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1627 |
* should first unload all vehicles and then start |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1628 |
* loading them. Since this will cause |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1629 |
* VEHICLE_TRIGGER_EMPTY to be called at the time when |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1630 |
* the whole vehicle chain is really totally empty, the |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1631 |
* completely_empty assignment can then be safely |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1632 |
* removed; that's how TTDPatch behaves too. --pasky */ |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1633 |
completely_empty = false; |
5251
f4123dca9ec2
(svn r7377) -Fix (r7326): With gradual loading, make sure cargo is only paid for once, and always notify the station the vehicle was present. (Maedhros)
peter1138
parents:
5220
diff
changeset
|
1634 |
anything_loaded = true; |
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1635 |
|
6198 | 1636 |
/* cargoshare is proportioned by the amount due to unload |
1637 |
* Otherwise, with gradual loading, 100% of credits would be taken immediately, |
|
1638 |
* even if the cargo volume represents a tiny percent of the whole. |
|
1639 |
* ge->unload_pending holds the amount that has been credited, but has not yet been unloaded. |
|
1640 |
*/ |
|
1641 |
int cargoshare = cap * 10000 / (ge->waiting_acceptance + ge->unload_pending); |
|
1642 |
int feeder_profit_share = ge->feeder_profit * cargoshare / 10000; |
|
0 | 1643 |
v->cargo_count += cap; |
1644 |
ge->waiting_acceptance -= cap; |
|
6198 | 1645 |
|
1646 |
total_cargo_feeder_share += feeder_profit_share; // store cost for later payment when cargo unloaded |
|
1647 |
v->cargo_loaded_at_xy = st->xy; // retains location of where the cargo was picked up for intermediate payments |
|
1648 |
||
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1905
diff
changeset
|
1649 |
ge->feeder_profit -= feeder_profit_share; |
0 | 1650 |
unloading_time += cap; |
1651 |
st->time_since_load = 0; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1652 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1653 |
/* And record the source of the cargo, and the days in travel. */ |
2815
dc557fb1f477
(svn r3363) -Fix: 'fixed' the transfer problem. This doesn't really fix it, but gives a bit more fair amount of money. Can only be fixed correctly with CargoPackets as suggested in branch.
truelight
parents:
2684
diff
changeset
|
1654 |
v->cargo_source = ge->enroute_from; |
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5668
diff
changeset
|
1655 |
v->cargo_source_xy = ge->enroute_from_xy; |
0 | 1656 |
v->cargo_days = ge->enroute_time; |
1657 |
result |= 2; |
|
3580
14bf6e7715c8
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3491
diff
changeset
|
1658 |
st->last_vehicle_type = v->type; |
0 | 1659 |
} |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1660 |
|
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1661 |
if (v->cargo_count == v->cargo_cap) { |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1662 |
SETBIT(cargo_full, v->cargo_type); |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1663 |
} else { |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1664 |
SETBIT(cargo_not_full, v->cargo_type); |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1665 |
} |
0 | 1666 |
} |
1667 |
||
6618
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1668 |
/* We update these variables here, so gradual loading still fills |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1669 |
* all wagons at the same time instead of using the same 'improved' |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1670 |
* loading algorithm for the wagons (only fill wagon when there is |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1671 |
* enough to fill the previous wagons) */ |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1672 |
if (_patches.improved_load && HASBIT(u->current_order.flags, OFB_FULL_LOAD)) { |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1673 |
/* Update left cargo */ |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1674 |
for (v = u; v != NULL; v = v->next) { |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1675 |
if (v->cargo_cap != 0) cargo_left[v->cargo_type] -= v->cargo_cap - v->cargo_count; |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1676 |
} |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1677 |
} |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1678 |
|
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
1679 |
v = u; |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1905
diff
changeset
|
1680 |
|
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1681 |
v->cargo_feeder_share += total_cargo_feeder_share; |
6198 | 1682 |
|
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1683 |
if (anything_loaded || anything_unloaded) { |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1684 |
if (_patches.gradual_loading) { |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1685 |
/* The time it takes to load one 'slice' of cargo or passengers depends |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1686 |
* on the vehicle type - the values here are those found in TTDPatch */ |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1687 |
const uint gradual_loading_wait_time[] = { 40, 20, 10, 20 }; |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
1688 |
|
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1689 |
unloading_time = gradual_loading_wait_time[v->type]; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1690 |
} |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1691 |
} else { |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1692 |
bool finished_loading = true; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1693 |
if (HASBIT(v->current_order.flags, OFB_FULL_LOAD)) { |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1694 |
if (_patches.full_load_any) { |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1695 |
/* if the aircraft carries passengers and is NOT full, then |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1696 |
* continue loading, no matter how much mail is in */ |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1697 |
if ((v->type == VEH_AIRCRAFT && IsCargoInClass(v->cargo_type, CC_PASSENGERS) && v->cargo_cap != v->cargo_count) || |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1698 |
(cargo_not_full && (cargo_full & ~cargo_not_full) == 0)) { // There are stull non-full cargos |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1699 |
finished_loading = false; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1700 |
} |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1701 |
} else if (cargo_not_full != 0) { |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1702 |
finished_loading = false; |
5251
f4123dca9ec2
(svn r7377) -Fix (r7326): With gradual loading, make sure cargo is only paid for once, and always notify the station the vehicle was present. (Maedhros)
peter1138
parents:
5220
diff
changeset
|
1703 |
} |
f4123dca9ec2
(svn r7377) -Fix (r7326): With gradual loading, make sure cargo is only paid for once, and always notify the station the vehicle was present. (Maedhros)
peter1138
parents:
5220
diff
changeset
|
1704 |
} |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1705 |
unloading_time = 20; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1706 |
|
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1707 |
SB(v->vehicle_flags, VF_LOADING_FINISHED, 1, finished_loading); |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
1708 |
} |
0 | 1709 |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
1710 |
if (v->type == VEH_TRAIN) { |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1711 |
/* Each platform tile is worth 2 rail vehicles. */ |
5998
2bfbade143ac
(svn r8709) -Fix/Codechange: Rename the function GetStationPlatforms into GetPlatformLength because that is what it really does. Overload it because there is already a GetPlatformLength (one gives the length of the whole platform, the other gives the remaining length in a given direction). Turned both functions into methods of Station. While messing around with it, fix a problem where loading times for overhanging trains are miscomputed.
celestar
parents:
5955
diff
changeset
|
1712 |
int overhang = v->u.rail.cached_total_length - st->GetPlatformLength(v->tile) * TILE_SIZE; |
2587
31647a23da0b
(svn r3124) Alter train loading/unloading time to use the actual length of the train instead of the number of wagons. The actual length is cached in the first vehicle of the train.
peter1138
parents:
2548
diff
changeset
|
1713 |
if (overhang > 0) { |
31647a23da0b
(svn r3124) Alter train loading/unloading time to use the actual length of the train instead of the number of wagons. The actual length is cached in the first vehicle of the train.
peter1138
parents:
2548
diff
changeset
|
1714 |
unloading_time <<= 1; |
31647a23da0b
(svn r3124) Alter train loading/unloading time to use the actual length of the train instead of the number of wagons. The actual length is cached in the first vehicle of the train.
peter1138
parents:
2548
diff
changeset
|
1715 |
unloading_time += (overhang * unloading_time) / 8; |
0 | 1716 |
} |
1717 |
} |
|
1718 |
||
1719 |
v->load_unload_time_rem = unloading_time; |
|
1720 |
||
445
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1721 |
if (completely_empty) { |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1722 |
TriggerVehicle(v, VEHICLE_TRIGGER_EMPTY); |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1723 |
} |
beafc0fb8f12
(svn r654) Hopefully complete support for randomized variational spritegroups (i.e. the cars transporter in DBSetXL gets different cars each time) (pasky)
tron
parents:
337
diff
changeset
|
1724 |
|
0 | 1725 |
if (result != 0) { |
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1726 |
InvalidateWindow(v->GetVehicleListWindowClass(), v->owner); |
0 | 1727 |
InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1728 |
|
6823
1f2075619543
(svn r10062) -Codechange: Don't redraw all station tiles when cargo is added or removed if the station has no custom graphics.
peter1138
parents:
6819
diff
changeset
|
1729 |
st->MarkTilesDirty(true); |
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1730 |
v->MarkDirty(); |
0 | 1731 |
|
2951 | 1732 |
if (result & 2) InvalidateWindow(WC_STATION_VIEW, last_visited); |
0 | 1733 |
} |
1734 |
} |
|
1735 |
||
6616
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1736 |
/** |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1737 |
* Load/unload the vehicles in this station according to the order |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1738 |
* they entered. |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1739 |
* @param st the station to do the loading/unloading for |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1740 |
*/ |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1741 |
void LoadUnloadStation(Station *st) |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1742 |
{ |
6618
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1743 |
int cargo_left[NUM_CARGO]; |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1744 |
|
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1745 |
for (uint i = 0; i < NUM_CARGO; i++) cargo_left[i] = GB(st->goods[i].waiting_acceptance, 0, 12); |
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1746 |
|
6616
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1747 |
std::list<Vehicle *>::iterator iter; |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1748 |
for (iter = st->loading_vehicles.begin(); iter != st->loading_vehicles.end(); ++iter) { |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1749 |
Vehicle *v = *iter; |
6618
094779076306
(svn r9838) -Fix: make "improved loading" a proper improved loading instead of loading one (semi-)random vehicle at a time:
rubidium
parents:
6616
diff
changeset
|
1750 |
if (!(v->vehstatus & (VS_STOPPED | VS_CRASHED))) LoadUnloadVehicle(v, cargo_left); |
6616
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1751 |
} |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1752 |
} |
0b3835bdd796
(svn r9836) -Codechange: make non-improved loading happen FIFO-ish; generally loading/unloading will happen fifo, but there are no guarantees on the FIFO-ness. For (better) FIFO guarantees you still need to use improved loading.
rubidium
parents:
6611
diff
changeset
|
1753 |
|
6247 | 1754 |
void PlayersMonthlyLoop() |
0 | 1755 |
{ |
1756 |
PlayersGenStatistics(); |
|
4293
4b7006c1b5eb
(svn r5926) -Codechange: make _cur_year contain the full year, instead of the offset since 1920
rubidium
parents:
4286
diff
changeset
|
1757 |
if (_patches.inflation && _cur_year < MAX_YEAR) |
0 | 1758 |
AddInflation(); |
1759 |
PlayersPayInterest(); |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1760 |
/* Reset the _current_player flag */ |
206 | 1761 |
_current_player = OWNER_NONE; |
0 | 1762 |
HandleEconomyFluctuations(); |
1763 |
SubsidyMonthlyHandler(); |
|
1764 |
} |
|
1765 |
||
1766 |
static void DoAcquireCompany(Player *p) |
|
1767 |
{ |
|
1768 |
Player *owner; |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1769 |
int i; |
200
03b8104d1479
(svn r201) -Fix: [1025836] Company values bigger dan int32 were put to negative
truelight
parents:
193
diff
changeset
|
1770 |
int64 value; |
0 | 1771 |
|
534
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
1772 |
SetDParam(0, p->name_1); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
1773 |
SetDParam(1, p->name_2); |
306bc86eb23e
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
523
diff
changeset
|
1774 |
SetDParam(2, p->bankrupt_value); |
4873
11880cbbc9f6
(svn r6803) -Codechange: Substitute magic numbers by an enum for the news windows
Darkvater
parents:
4854
diff
changeset
|
1775 |
AddNewsItem( (StringID)(_current_player | NB_BMERGER), NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0); |
0 | 1776 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1777 |
/* original code does this a little bit differently */ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1778 |
PlayerID pi = p->index; |
6262
312d9c28da04
(svn r9071) -Fix [FS#459]: when in networking an other player takes over an AI which is also controlled by a player, move the player with the company to the company who bought out the AI
truelight
parents:
6259
diff
changeset
|
1779 |
ChangeNetworkOwner(pi, _current_player); |
0 | 1780 |
ChangeOwnershipOfPlayerItems(pi, _current_player); |
1781 |
||
1782 |
if (p->bankrupt_value == 0) { |
|
1962
8254df1b359b
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1935
diff
changeset
|
1783 |
owner = GetPlayer(_current_player); |
0 | 1784 |
owner->current_loan += p->current_loan; |
1785 |
} |
|
1786 |
||
1787 |
value = CalculateCompanyValue(p) >> 2; |
|
2952 | 1788 |
for (i = 0; i != 4; i++) { |
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4845
diff
changeset
|
1789 |
if (p->share_owners[i] != PLAYER_SPECTATOR) { |
1962
8254df1b359b
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1935
diff
changeset
|
1790 |
owner = GetPlayer(p->share_owners[i]); |
0 | 1791 |
owner->money64 += value; |
1792 |
owner->yearly_expenses[0][EXPENSES_OTHER] += value; |
|
1793 |
UpdatePlayerMoney32(owner); |
|
1794 |
} |
|
1795 |
} |
|
1796 |
||
1797 |
p->is_active = false; |
|
1798 |
||
1799 |
DeletePlayerWindows(pi); |
|
4434
a08cb4b5c179
(svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents:
4423
diff
changeset
|
1800 |
RebuildVehicleLists(); //Updates the open windows to add the newly acquired vehicles to the lists |
0 | 1801 |
} |
1802 |
||
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1803 |
extern int GetAmountOwnedBy(const Player *p, PlayerID owner); |
599
30da691a5561
(svn r1023) -Fix: [Network] [ 1083692 ] You can no longer buy out a company in MP
truelight
parents:
555
diff
changeset
|
1804 |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1805 |
/** Acquire shares in an opposing company. |
3491
35d747bb5e82
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3421
diff
changeset
|
1806 |
* @param tile unused |
6432
226650eb2ef3
(svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible
belugas
parents:
6405
diff
changeset
|
1807 |
* @param flags type of operation |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1808 |
* @param p1 player to buy the shares from |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1809 |
* @param p2 unused |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1810 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
1811 |
CommandCost CmdBuyShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1812 |
{ |
1813 |
Player *p; |
|
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
1814 |
CommandCost cost; |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1815 |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1816 |
/* Check if buying shares is allowed (protection against modified clients */ |
4850
93095755db8c
(svn r6776) -Codechange: Use IsValidPlayer() function to determine of a PlayerID is an
Darkvater
parents:
4848
diff
changeset
|
1817 |
if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares) return CMD_ERROR; |
0 | 1818 |
|
1819 |
SET_EXPENSES_TYPE(EXPENSES_OTHER); |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1820 |
p = GetPlayer((PlayerID)p1); |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
997
diff
changeset
|
1821 |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1822 |
/* Protect new companies from hostile takeovers */ |
4329
0e6e689f66e7
(svn r6002) -Cleanup: remove the now redundant BASE_YEAR constant.
rubidium
parents:
4293
diff
changeset
|
1823 |
if (_cur_year - p->inaugurated_year < 6) return_cmd_error(STR_7080_PROTECTED); |
930
ab42e283749d
(svn r1418) -Feature: [1098254] (dis)Allow Shares. Add patch options to allow buying/selling of shares (Hackykid)
darkvater
parents:
919
diff
changeset
|
1824 |
|
599
30da691a5561
(svn r1023) -Fix: [Network] [ 1083692 ] You can no longer buy out a company in MP
truelight
parents:
555
diff
changeset
|
1825 |
/* Those lines are here for network-protection (clients can be slow) */ |
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4845
diff
changeset
|
1826 |
if (GetAmountOwnedBy(p, PLAYER_SPECTATOR) == 0) return 0; |
930
ab42e283749d
(svn r1418) -Feature: [1098254] (dis)Allow Shares. Add patch options to allow buying/selling of shares (Hackykid)
darkvater
parents:
919
diff
changeset
|
1827 |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1828 |
/* We can not buy out a real player (temporarily). TODO: well, enable it obviously */ |
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4845
diff
changeset
|
1829 |
if (GetAmountOwnedBy(p, PLAYER_SPECTATOR) == 1 && !p->is_ai) return 0; |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
997
diff
changeset
|
1830 |
|
0 | 1831 |
cost = CalculateCompanyValue(p) >> 2; |
1832 |
if (flags & DC_EXEC) { |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1833 |
PlayerByte* b = p->share_owners; |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1834 |
int i; |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1835 |
|
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4845
diff
changeset
|
1836 |
while (*b != PLAYER_SPECTATOR) b++; /* share owners is guaranteed to contain at least one PLAYER_SPECTATOR */ |
0 | 1837 |
*b = _current_player; |
1838 |
||
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1839 |
for (i = 0; p->share_owners[i] == _current_player;) { |
0 | 1840 |
if (++i == 4) { |
1841 |
p->bankrupt_value = 0; |
|
1842 |
DoAcquireCompany(p); |
|
1843 |
break; |
|
1844 |
} |
|
1845 |
} |
|
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
1846 |
InvalidateWindow(WC_COMPANY, p1); |
0 | 1847 |
} |
1848 |
return cost; |
|
1849 |
} |
|
1850 |
||
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1851 |
/** Sell shares in an opposing company. |
3491
35d747bb5e82
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3421
diff
changeset
|
1852 |
* @param tile unused |
6432
226650eb2ef3
(svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible
belugas
parents:
6405
diff
changeset
|
1853 |
* @param flags type of operation |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1854 |
* @param p1 player to sell the shares from |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1855 |
* @param p2 unused |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1856 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
1857 |
CommandCost CmdSellShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1858 |
{ |
1859 |
Player *p; |
|
200
03b8104d1479
(svn r201) -Fix: [1025836] Company values bigger dan int32 were put to negative
truelight
parents:
193
diff
changeset
|
1860 |
int64 cost; |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1861 |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1862 |
/* Check if buying shares is allowed (protection against modified clients */ |
4850
93095755db8c
(svn r6776) -Codechange: Use IsValidPlayer() function to determine of a PlayerID is an
Darkvater
parents:
4848
diff
changeset
|
1863 |
if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares) return CMD_ERROR; |
0 | 1864 |
|
1865 |
SET_EXPENSES_TYPE(EXPENSES_OTHER); |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1866 |
p = GetPlayer((PlayerID)p1); |
0 | 1867 |
|
653
989ae721eb8b
(svn r1086) -Fix: [Network] [ 1084774 ] Fixed quick-share-sell bug
truelight
parents:
630
diff
changeset
|
1868 |
/* Those lines are here for network-protection (clients can be slow) */ |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1869 |
if (GetAmountOwnedBy(p, _current_player) == 0) return 0; |
653
989ae721eb8b
(svn r1086) -Fix: [Network] [ 1084774 ] Fixed quick-share-sell bug
truelight
parents:
630
diff
changeset
|
1870 |
|
0 | 1871 |
/* adjust it a little to make it less profitable to sell and buy */ |
1872 |
cost = CalculateCompanyValue(p) >> 2; |
|
1873 |
cost = -(cost - (cost >> 7)); |
|
1874 |
||
1875 |
if (flags & DC_EXEC) { |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1876 |
PlayerByte* b = p->share_owners; |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1877 |
while (*b != _current_player) b++; // share owners is guaranteed to contain player |
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4845
diff
changeset
|
1878 |
*b = PLAYER_SPECTATOR; |
3017
a75caf4efa2d
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents:
2989
diff
changeset
|
1879 |
InvalidateWindow(WC_COMPANY, p1); |
0 | 1880 |
} |
1881 |
return cost; |
|
1882 |
} |
|
1883 |
||
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1884 |
/** Buy up another company. |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1885 |
* When a competing company is gone bankrupt you get the chance to purchase |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1886 |
* that company. |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1887 |
* @todo currently this only works for AI players |
3491
35d747bb5e82
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3421
diff
changeset
|
1888 |
* @param tile unused |
6432
226650eb2ef3
(svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible
belugas
parents:
6405
diff
changeset
|
1889 |
* @param flags type of operation |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1890 |
* @param p1 player/company to buy up |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1891 |
* @param p2 unused |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1892 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
1893 |
CommandCost CmdBuyCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1894 |
{ |
1895 |
Player *p; |
|
6405
aa7d8578cce9
(svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities
celestar
parents:
6403
diff
changeset
|
1896 |
PlayerID pid = (PlayerID)p1; |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1897 |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1898 |
/* Disable takeovers in multiplayer games */ |
6405
aa7d8578cce9
(svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities
celestar
parents:
6403
diff
changeset
|
1899 |
if (!IsValidPlayer(pid) || _networking) return CMD_ERROR; |
aa7d8578cce9
(svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities
celestar
parents:
6403
diff
changeset
|
1900 |
|
aa7d8578cce9
(svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities
celestar
parents:
6403
diff
changeset
|
1901 |
/* Do not allow players to take over themselves */ |
aa7d8578cce9
(svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities
celestar
parents:
6403
diff
changeset
|
1902 |
if (pid == _current_player) return CMD_ERROR; |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1903 |
|
0 | 1904 |
SET_EXPENSES_TYPE(EXPENSES_OTHER); |
6405
aa7d8578cce9
(svn r9541) -Codechange: Safeguard the company-buying routines so that the buying player and the bought player need to be two different entities
celestar
parents:
6403
diff
changeset
|
1905 |
p = GetPlayer(pid); |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1906 |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1907 |
if (!p->is_ai) return CMD_ERROR; |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1908 |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1909 |
if (flags & DC_EXEC) { |
0 | 1910 |
DoAcquireCompany(p); |
1911 |
} |
|
1912 |
return p->bankrupt_value; |
|
1913 |
} |
|
1914 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1915 |
/** Prices */ |
6247 | 1916 |
static void SaveLoad_PRIC() |
0 | 1917 |
{ |
4344
7e123fec5b0b
(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
|
1918 |
SlArray(&_price, NUM_PRICES, SLE_INT32); |
0 | 1919 |
SlArray(&_price_frac, NUM_PRICES, SLE_UINT16); |
1920 |
} |
|
1921 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1922 |
/** Cargo payment rates */ |
6247 | 1923 |
static void SaveLoad_CAPR() |
0 | 1924 |
{ |
6463
e986fe39dfe7
(svn r9638) -Feature: Increase cargo types from 12 to 32 and enable newcargo flag in NewGRF loader.
peter1138
parents:
6458
diff
changeset
|
1925 |
uint num_cargo = CheckSavegameVersion(55) ? 12 : NUM_CARGO; |
e986fe39dfe7
(svn r9638) -Feature: Increase cargo types from 12 to 32 and enable newcargo flag in NewGRF loader.
peter1138
parents:
6458
diff
changeset
|
1926 |
SlArray(&_cargo_payment_rates, num_cargo, SLE_INT32); |
e986fe39dfe7
(svn r9638) -Feature: Increase cargo types from 12 to 32 and enable newcargo flag in NewGRF loader.
peter1138
parents:
6458
diff
changeset
|
1927 |
SlArray(&_cargo_payment_rates_frac, num_cargo, SLE_UINT16); |
0 | 1928 |
} |
1929 |
||
1881
435d39bd6ee0
(svn r2387) - CodeChange: made the saveload code more readable and also removed the 'byte' saveload arrays which means you can save an array of more than 255 elements, or bigger structs than 255 bytes. This doesn't yet solve the problem that a chunk can be a maximum of 16384 big.
Darkvater
parents:
1797
diff
changeset
|
1930 |
static const SaveLoad _economy_desc[] = { |
4344
7e123fec5b0b
(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
|
1931 |
SLE_VAR(Economy, max_loan, SLE_INT32), |
7e123fec5b0b
(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
|
1932 |
SLE_VAR(Economy, max_loan_unround, SLE_INT32), |
7e123fec5b0b
(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
|
1933 |
SLE_VAR(Economy, fluct, SLE_FILE_I16 | SLE_VAR_I32), |
7e123fec5b0b
(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
|
1934 |
SLE_VAR(Economy, interest_rate, SLE_UINT8), |
7e123fec5b0b
(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
|
1935 |
SLE_VAR(Economy, infl_amount, SLE_UINT8), |
7e123fec5b0b
(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
|
1936 |
SLE_VAR(Economy, infl_amount_pr, SLE_UINT8), |
0 | 1937 |
SLE_END() |
1938 |
}; |
|
1939 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1940 |
/** Economy variables */ |
6247 | 1941 |
static void SaveLoad_ECMY() |
0 | 1942 |
{ |
1881
435d39bd6ee0
(svn r2387) - CodeChange: made the saveload code more readable and also removed the 'byte' saveload arrays which means you can save an array of more than 255 elements, or bigger structs than 255 bytes. This doesn't yet solve the problem that a chunk can be a maximum of 16384 big.
Darkvater
parents:
1797
diff
changeset
|
1943 |
SlObject(&_economy, _economy_desc); |
0 | 1944 |
} |
1945 |
||
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1946 |
extern const ChunkHandler _economy_chunk_handlers[] = { |
0 | 1947 |
{ 'PRIC', SaveLoad_PRIC, SaveLoad_PRIC, CH_RIFF | CH_AUTO_LENGTH}, |
1948 |
{ 'CAPR', SaveLoad_CAPR, SaveLoad_CAPR, CH_RIFF | CH_AUTO_LENGTH}, |
|
4344
7e123fec5b0b
(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
|
1949 |
{ 'SUBS', Save_SUBS, Load_SUBS, CH_ARRAY}, |
0 | 1950 |
{ 'ECMY', SaveLoad_ECMY, SaveLoad_ECMY, CH_RIFF | CH_LAST}, |
1951 |
}; |