author | peter1138 |
Mon, 02 Jun 2008 06:42:27 +0000 | |
changeset 9438 | e6aa429e06fc |
parent 9428 | 1ba05b499957 |
child 9605 | 5a1897abd925 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
9111
48ce04029fe4
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
rubidium
parents:
9058
diff
changeset
|
3 |
/** @file economy.cpp Handling of the economy. */ |
6125
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" |
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
|
8 |
#include "landscape.h" |
8254
1496654ca5e7
(svn r11818) -Codechange: split player.h into smaller pieces.
rubidium
parents:
8241
diff
changeset
|
9 |
#include "player_base.h" |
1496654ca5e7
(svn r11818) -Codechange: split player.h into smaller pieces.
rubidium
parents:
8241
diff
changeset
|
10 |
#include "player_func.h" |
8116
8da76dcb3287
(svn r11677) -Codechange: move price and command related types/functions to their respective places.
rubidium
parents:
8114
diff
changeset
|
11 |
#include "command_func.h" |
0 | 12 |
#include "saveload.h" |
13 |
#include "industry.h" |
|
14 |
#include "town.h" |
|
8763
81fadd257f67
(svn r12459) -Codechange: split news.h into news_type.h and news_func.h.
rubidium
parents:
8626
diff
changeset
|
15 |
#include "news_func.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
|
16 |
#include "network/network.h" |
9428
1ba05b499957
(svn r13343) -Codechange: reorder/move variable/functions in the network headers so that nothing from the network directory needs to include basically all network headers.
rubidium
parents:
9413
diff
changeset
|
17 |
#include "network/network_func.h" |
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2150
diff
changeset
|
18 |
#include "variables.h" |
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2150
diff
changeset
|
19 |
#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
|
20 |
#include "ai/ai.h" |
2676
59b65b4fb480
(svn r3218) -Feature: Multiheaded train engines will now stay in the same train
bjarni
parents:
2642
diff
changeset
|
21 |
#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
|
22 |
#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
|
23 |
#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
|
24 |
#include "newgrf_engine.h" |
4701 | 25 |
#include "newgrf_sound.h" |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
26 |
#include "newgrf_callbacks.h" |
7168
25e07ccb4a3d
(svn r10442) -Codechange: implement the industry production callback.
rubidium
parents:
7167
diff
changeset
|
27 |
#include "newgrf_industries.h" |
7229
a5f262f6df1b
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7199
diff
changeset
|
28 |
#include "newgrf_industrytiles.h" |
9003
7972fa66d9c9
(svn r12798) -Feature: Add some support for NewGRF station animation. (Thanks to mart3p for samples and fixes)
peter1138
parents:
8885
diff
changeset
|
29 |
#include "newgrf_station.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
|
30 |
#include "unmovable.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
|
31 |
#include "cargotype.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
|
32 |
#include "group.h" |
8114
dd6d21dc99c1
(svn r11675) -Codechange: split the string types from the string functions.
rubidium
parents:
8106
diff
changeset
|
33 |
#include "strings_func.h" |
8119
52b48108425a
(svn r11680) -Codechange: refactor more out of openttd.h and functions.h.
rubidium
parents:
8116
diff
changeset
|
34 |
#include "tile_cmd.h" |
8131
160939e24ed3
(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
rubidium
parents:
8121
diff
changeset
|
35 |
#include "functions.h" |
160939e24ed3
(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
rubidium
parents:
8121
diff
changeset
|
36 |
#include "window_func.h" |
8140
0d0d8c94f84b
(svn r11702) -Codechange: move all date related stuff to date*.
rubidium
parents:
8139
diff
changeset
|
37 |
#include "date_func.h" |
8144
65cec0877b78
(svn r11706) -Codechange: split vehicle.h and remove another bunch of useless includes.
rubidium
parents:
8140
diff
changeset
|
38 |
#include "vehicle_func.h" |
8157
1505def01945
(svn r11719) -Codechange: split sound.h in a header with types and one with functions.
rubidium
parents:
8155
diff
changeset
|
39 |
#include "sound_func.h" |
8200
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
40 |
#include "track_type.h" |
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
41 |
#include "track_func.h" |
8342
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8306
diff
changeset
|
42 |
#include "road_func.h" |
8200
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
43 |
#include "rail_map.h" |
8238
d47a86c79603
(svn r11802) -Fix [FS#716]: do not crash trains when leaving depot to a very long track
smatz
parents:
8231
diff
changeset
|
44 |
#include "signal_func.h" |
8224
c5a64d87cc54
(svn r11787) -Codechange: more header rewrites. This time related to viewport.h.
rubidium
parents:
8200
diff
changeset
|
45 |
#include "gfx_func.h" |
9058
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
46 |
#include "autoreplace_func.h" |
9117
87f472043e9e
(svn r12977) -Codechange: remove quite some redundant (duplicate) function declarations.
rubidium
parents:
9111
diff
changeset
|
47 |
#include "player_gui.h" |
0 | 48 |
|
8264
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8254
diff
changeset
|
49 |
#include "table/strings.h" |
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8254
diff
changeset
|
50 |
#include "table/sprites.h" |
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8254
diff
changeset
|
51 |
|
7926
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
52 |
/** |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
53 |
* Multiply two integer values and shift the results to right. |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
54 |
* |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
55 |
* This function multiplies two integer values. The result is |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
56 |
* shifted by the amount of shift to right. |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
57 |
* |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
58 |
* @param a The first integer |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
59 |
* @param b The second integer |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
60 |
* @param shift The amount to shift the value to right. |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
61 |
* @return The shifted result |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
62 |
*/ |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
63 |
static inline int32 BigMulS(const int32 a, const int32 b, const uint8 shift) |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
64 |
{ |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
65 |
return (int32)((int64)a * (int64)b >> shift); |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
66 |
} |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
67 |
|
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
68 |
/** |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
69 |
* Multiply two unsigned integers and shift the results to right. |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
70 |
* |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
71 |
* This function multiplies two unsigned integers. The result is |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
72 |
* shifted by the amount of shift to right. |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
73 |
* |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
74 |
* @param a The first unsigned integer |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
75 |
* @param b The second unsigned integer |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
76 |
* @param shift The amount to shift the value to right. |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
77 |
* @return The shifted result |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
78 |
*/ |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
79 |
static inline uint32 BigMulSU(const uint32 a, const uint32 b, const uint8 shift) |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
80 |
{ |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
81 |
return (uint32)((uint64)a * (uint64)b >> shift); |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
82 |
} |
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
83 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
84 |
/* Score info */ |
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
85 |
const ScoreInfo _score_info[] = { |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
86 |
{ SCORE_VEHICLES, 120, 100 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
87 |
{ SCORE_STATIONS, 80, 100 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
88 |
{ SCORE_MIN_PROFIT, 10000, 100 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
89 |
{ SCORE_MIN_INCOME, 50000, 50 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
90 |
{ SCORE_MAX_INCOME, 100000, 100 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
91 |
{ SCORE_DELIVERED, 40000, 400 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
92 |
{ SCORE_CARGO, 8, 50 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
93 |
{ SCORE_MONEY, 10000000, 50 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
94 |
{ SCORE_LOAN, 250000, 50 }, |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
95 |
{ SCORE_TOTAL, 0, 0 } |
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
96 |
}; |
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
97 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
98 |
int _score_part[MAX_PLAYERS][SCORE_END]; |
8116
8da76dcb3287
(svn r11677) -Codechange: move price and command related types/functions to their respective places.
rubidium
parents:
8114
diff
changeset
|
99 |
Economy _economy; |
8da76dcb3287
(svn r11677) -Codechange: move price and command related types/functions to their respective places.
rubidium
parents:
8114
diff
changeset
|
100 |
Subsidy _subsidies[MAX_PLAYERS]; |
8da76dcb3287
(svn r11677) -Codechange: move price and command related types/functions to their respective places.
rubidium
parents:
8114
diff
changeset
|
101 |
Prices _price; |
8da76dcb3287
(svn r11677) -Codechange: move price and command related types/functions to their respective places.
rubidium
parents:
8114
diff
changeset
|
102 |
uint16 _price_frac[NUM_PRICES]; |
8119
52b48108425a
(svn r11680) -Codechange: refactor more out of openttd.h and functions.h.
rubidium
parents:
8116
diff
changeset
|
103 |
Money _cargo_payment_rates[NUM_CARGO]; |
52b48108425a
(svn r11680) -Codechange: refactor more out of openttd.h and functions.h.
rubidium
parents:
8116
diff
changeset
|
104 |
uint16 _cargo_payment_rates_frac[NUM_CARGO]; |
52b48108425a
(svn r11680) -Codechange: refactor more out of openttd.h and functions.h.
rubidium
parents:
8116
diff
changeset
|
105 |
Money _additional_cash_required; |
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
106 |
|
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
107 |
Money CalculateCompanyValue(const Player* p) |
2475 | 108 |
{ |
109 |
PlayerID owner = p->index; |
|
7781
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
110 |
Money value = 0; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
111 |
|
7781
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
112 |
Station *st; |
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
113 |
uint num = 0; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
114 |
|
7781
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
115 |
FOR_ALL_STATIONS(st) { |
7832
60035eb28f08
(svn r11382) -Codechange: renamed COUNTBITS to CountBits, as it is no longer a macro (skidd13)
truelight
parents:
7824
diff
changeset
|
116 |
if (st->owner == owner) num += CountBits(st->facilities); |
0 | 117 |
} |
118 |
||
7781
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
119 |
value += num * _price.station_value * 25; |
4346
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
120 |
|
7781
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
121 |
Vehicle *v; |
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
122 |
FOR_ALL_VEHICLES(v) { |
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
123 |
if (v->owner != owner) continue; |
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
124 |
|
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
125 |
if (v->type == VEH_TRAIN || |
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
126 |
v->type == VEH_ROAD || |
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
127 |
(v->type == VEH_AIRCRAFT && IsNormalAircraft(v)) || |
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
128 |
v->type == VEH_SHIP) { |
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
129 |
value += v->value * 3 >> 1; |
0 | 130 |
} |
131 |
} |
|
132 |
||
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
133 |
/* Add real money value */ |
7781
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
134 |
value -= p->current_loan; |
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
135 |
value += p->player_money; |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
997
diff
changeset
|
136 |
|
7781
bceee111342f
(svn r11331) -Fix: do not misuse CommandCost for overflow safe stuff as Money supports that now too.
rubidium
parents:
7763
diff
changeset
|
137 |
return max(value, (Money)1); |
0 | 138 |
} |
139 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
140 |
/** 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
|
141 |
* (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
|
142 |
* @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
|
143 |
* @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
|
144 |
* @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
|
145 |
* */ |
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
|
146 |
int UpdateCompanyRatingAndValue(Player *p, bool update) |
0 | 147 |
{ |
148 |
byte owner = p->index; |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
149 |
int score = 0; |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
150 |
|
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
151 |
memset(_score_part[owner], 0, sizeof(_score_part[owner])); |
0 | 152 |
|
153 |
/* Count vehicles */ |
|
154 |
{ |
|
155 |
Vehicle *v; |
|
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
156 |
Money min_profit = 0; |
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
|
157 |
bool min_profit_first = true; |
0 | 158 |
uint num = 0; |
159 |
||
160 |
FOR_ALL_VEHICLES(v) { |
|
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
161 |
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
|
162 |
if (IsPlayerBuildableVehicleType(v->type) && v->IsPrimaryVehicle()) { |
0 | 163 |
num++; |
164 |
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
|
165 |
/* Find the vehicle with the lowest amount of profit */ |
8614
4c67a883c4c4
(svn r12197) -Fix [FS#1788](r12134): show correct last year profit when the train had negative income
smatz
parents:
8556
diff
changeset
|
166 |
if (min_profit_first || min_profit > v->profit_last_year) { |
4c67a883c4c4
(svn r12197) -Fix [FS#1788](r12134): show correct last year profit when the train had negative income
smatz
parents:
8556
diff
changeset
|
167 |
min_profit = v->profit_last_year; |
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
|
168 |
min_profit_first = false; |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
169 |
} |
0 | 170 |
} |
171 |
} |
|
172 |
} |
|
173 |
||
8614
4c67a883c4c4
(svn r12197) -Fix [FS#1788](r12134): show correct last year profit when the train had negative income
smatz
parents:
8556
diff
changeset
|
174 |
min_profit >>= 8; // remove the fract part |
4c67a883c4c4
(svn r12197) -Fix [FS#1788](r12134): show correct last year profit when the train had negative income
smatz
parents:
8556
diff
changeset
|
175 |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
176 |
_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
|
177 |
/* 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
|
178 |
if (min_profit > 0) |
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
179 |
_score_part[owner][SCORE_MIN_PROFIT] = ClampToI32(min_profit); |
0 | 180 |
} |
181 |
||
182 |
/* Count stations */ |
|
183 |
{ |
|
184 |
uint num = 0; |
|
3033
9cba043eb38f
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3017
diff
changeset
|
185 |
const Station* st; |
0 | 186 |
|
187 |
FOR_ALL_STATIONS(st) { |
|
7832
60035eb28f08
(svn r11382) -Codechange: renamed COUNTBITS to CountBits, as it is no longer a macro (skidd13)
truelight
parents:
7824
diff
changeset
|
188 |
if (st->owner == owner) num += CountBits(st->facilities); |
0 | 189 |
} |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
190 |
_score_part[owner][SCORE_STATIONS] = num; |
0 | 191 |
} |
192 |
||
193 |
/* Generate statistics depending on recent income statistics */ |
|
194 |
{ |
|
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
195 |
int numec = min(p->num_valid_stat_ent, 12); |
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
196 |
if (numec != 0) { |
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
197 |
const PlayerEconomyEntry *pee = p->old_economy; |
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
198 |
Money min_income = pee->income + pee->expenses; |
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
199 |
Money max_income = pee->income + pee->expenses; |
0 | 200 |
|
201 |
do { |
|
202 |
min_income = min(min_income, pee->income + pee->expenses); |
|
203 |
max_income = max(max_income, pee->income + pee->expenses); |
|
204 |
} while (++pee,--numec); |
|
205 |
||
206 |
if (min_income > 0) |
|
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
207 |
_score_part[owner][SCORE_MIN_INCOME] = ClampToI32(min_income); |
0 | 208 |
|
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
209 |
_score_part[owner][SCORE_MAX_INCOME] = ClampToI32(max_income); |
0 | 210 |
} |
211 |
} |
|
212 |
||
213 |
/* Generate score depending on amount of transported cargo */ |
|
214 |
{ |
|
3033
9cba043eb38f
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3017
diff
changeset
|
215 |
const PlayerEconomyEntry* pee; |
0 | 216 |
int numec; |
217 |
uint32 total_delivered; |
|
218 |
||
219 |
numec = min(p->num_valid_stat_ent, 4); |
|
220 |
if (numec != 0) { |
|
221 |
pee = p->old_economy; |
|
222 |
total_delivered = 0; |
|
223 |
do { |
|
224 |
total_delivered += pee->delivered_cargo; |
|
225 |
} while (++pee,--numec); |
|
226 |
||
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
227 |
_score_part[owner][SCORE_DELIVERED] = total_delivered; |
0 | 228 |
} |
229 |
} |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
230 |
|
0 | 231 |
/* Generate score for variety of cargo */ |
232 |
{ |
|
7832
60035eb28f08
(svn r11382) -Codechange: renamed COUNTBITS to CountBits, as it is no longer a macro (skidd13)
truelight
parents:
7824
diff
changeset
|
233 |
uint num = CountBits(p->cargo_types); |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
234 |
_score_part[owner][SCORE_CARGO] = num; |
3033
9cba043eb38f
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3017
diff
changeset
|
235 |
if (update) p->cargo_types = 0; |
0 | 236 |
} |
237 |
||
238 |
/* Generate score for player money */ |
|
239 |
{ |
|
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
240 |
if (p->player_money > 0) { |
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
241 |
_score_part[owner][SCORE_MONEY] = ClampToI32(p->player_money); |
0 | 242 |
} |
243 |
} |
|
244 |
||
245 |
/* Generate score for loan */ |
|
246 |
{ |
|
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
247 |
_score_part[owner][SCORE_LOAN] = ClampToI32(_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
|
248 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
249 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
250 |
/* 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
|
251 |
{ |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
252 |
int total_score = 0; |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
253 |
int s; |
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
254 |
score = 0; |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
255 |
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
|
256 |
/* Skip the total */ |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
257 |
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
|
258 |
/* Check the score */ |
7922
a7e266f966d9
(svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents:
7860
diff
changeset
|
259 |
s = Clamp(_score_part[owner][i], 0, _score_info[i].needed) * _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
|
260 |
score += s; |
2261
d3554e5d3e86
(svn r2781) Fix some of the issues with variables in .h files.
ludde
parents:
2218
diff
changeset
|
261 |
total_score += _score_info[i].score; |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
262 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
263 |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
264 |
_score_part[owner][SCORE_TOTAL] = score; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
265 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
266 |
/* 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
|
267 |
if (total_score != SCORE_MAX) score = score * SCORE_MAX / total_score; |
0 | 268 |
} |
269 |
||
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
270 |
if (update) { |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
271 |
p->old_economy[0].performance_history = score; |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
272 |
UpdateCompanyHQ(p, score); |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
273 |
p->old_economy[0].company_value = CalculateCompanyValue(p); |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
274 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
275 |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
276 |
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
|
277 |
return score; |
0 | 278 |
} |
279 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
280 |
/* use PLAYER_SPECTATOR as new_player to delete the player. */ |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
281 |
void ChangeOwnershipOfPlayerItems(PlayerID old_player, PlayerID new_player) |
0 | 282 |
{ |
5284
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
283 |
Town *t; |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
284 |
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
|
285 |
|
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
|
286 |
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
|
287 |
|
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
|
288 |
{ |
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
|
289 |
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
|
290 |
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
|
291 |
|
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
|
292 |
/* 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
|
293 |
_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
|
294 |
FOR_ALL_PLAYERS(p) { |
8155
ab1e6353db79
(svn r11717) -Fix [FS#1590]: make sure invalid players have all shares owned by PLAYER_SPECTATOR
smatz
parents:
8144
diff
changeset
|
295 |
if (!p->is_active) continue; |
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
|
296 |
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
|
297 |
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
|
298 |
/* Sell his shares */ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
299 |
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
|
300 |
/* 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
|
301 |
* 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
|
302 |
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
|
303 |
} |
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
|
304 |
} |
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
|
305 |
} |
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
|
306 |
|
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
|
307 |
/* 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
|
308 |
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
|
309 |
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
|
310 |
_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
|
311 |
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
|
312 |
/* Sell the shares */ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
313 |
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
|
314 |
/* 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
|
315 |
* 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
|
316 |
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
|
317 |
} |
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
|
318 |
} |
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
|
319 |
} |
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
|
320 |
|
0 | 321 |
_current_player = old_player; |
322 |
||
4260
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
323 |
/* 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
|
324 |
* 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
|
325 |
* 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
|
326 |
if (new_player == PLAYER_SPECTATOR) { |
6952
b19643469024
(svn r10207) -Codechange: remove the redundant player_money in favour of the money64, which is now renamed to player_money.
rubidium
parents:
6950
diff
changeset
|
327 |
GetPlayer(old_player)->player_money = MAX_UVALUE(uint64) >> 2; // jackpot ;p |
4260
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
328 |
} |
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
329 |
|
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4845
diff
changeset
|
330 |
if (new_player == PLAYER_SPECTATOR) { |
0 | 331 |
Subsidy *s; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
332 |
|
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
333 |
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
|
334 |
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
|
335 |
if (GetStation(s->to)->owner == old_player) s->cargo_type = CT_INVALID; |
0 | 336 |
} |
337 |
} |
|
338 |
} |
|
339 |
||
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
340 |
/* 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
|
341 |
FOR_ALL_TOWNS(t) { |
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
342 |
/* 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
|
343 |
if (new_player != PLAYER_SPECTATOR) { |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7926
diff
changeset
|
344 |
if (HasBit(t->have_ratings, old_player)) { |
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7926
diff
changeset
|
345 |
if (HasBit(t->have_ratings, new_player)) { |
4260
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
346 |
// 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
|
347 |
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
|
348 |
} else { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
349 |
SetBit(t->have_ratings, new_player); |
4260
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
350 |
t->ratings[new_player] = t->ratings[old_player]; |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
351 |
} |
4260
c638c6441121
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4077
diff
changeset
|
352 |
} |
5284
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
353 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
354 |
|
5284
abfa5fac015f
(svn r7433) -Fix (r2301): Town ratings were not reset when a company went bankrupt.
peter1138
parents:
5251
diff
changeset
|
355 |
/* Reset the ratings for the old player */ |
8814
bff94f5654b5
(svn r12560) -Cleanup: town_cmd.cpp and header files - variable scope and a bit of coding style
smatz
parents:
8786
diff
changeset
|
356 |
t->ratings[old_player] = RATING_INITIAL; |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
357 |
ClrBit(t->have_ratings, old_player); |
0 | 358 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
359 |
|
0 | 360 |
{ |
361 |
int num_train = 0; |
|
362 |
int num_road = 0; |
|
363 |
int num_ship = 0; |
|
364 |
int num_aircraft = 0; |
|
365 |
Vehicle *v; |
|
366 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
367 |
/* Determine Ids for the new vehicles */ |
0 | 368 |
FOR_ALL_VEHICLES(v) { |
369 |
if (v->owner == new_player) { |
|
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
370 |
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
|
371 |
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
|
372 |
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
|
373 |
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
|
374 |
case VEH_AIRCRAFT: if (IsNormalAircraft(v)) num_aircraft++; break; |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
375 |
default: break; |
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
376 |
} |
0 | 377 |
} |
378 |
} |
|
379 |
||
380 |
FOR_ALL_VEHICLES(v) { |
|
7954
57b51c69c072
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents:
7931
diff
changeset
|
381 |
if (v->owner == old_player && IsInsideMM(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
|
382 |
if (new_player == PLAYER_SPECTATOR) { |
0 | 383 |
DeleteWindowById(WC_VEHICLE_VIEW, v->index); |
384 |
DeleteWindowById(WC_VEHICLE_DETAILS, v->index); |
|
385 |
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
|
386 |
|
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
387 |
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
|
388 |
switch (v->type) { |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
389 |
default: NOT_REACHED(); |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
390 |
|
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
391 |
case VEH_TRAIN: { |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
392 |
Vehicle *u = v; |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
393 |
do { |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
394 |
Vehicle *next = GetNextVehicle(u); |
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7329
diff
changeset
|
395 |
delete u; |
6876
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
396 |
u = next; |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
397 |
} while (u != NULL); |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
398 |
} break; |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
399 |
|
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
400 |
case VEH_ROAD: |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
401 |
case VEH_SHIP: |
7398
b933416cf32b
(svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
rubidium
parents:
7329
diff
changeset
|
402 |
delete v; |
6876
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
403 |
break; |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
404 |
|
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
405 |
case VEH_AIRCRAFT: |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
406 |
DeleteVehicleChain(v); |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
407 |
break; |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
408 |
} |
22305fa54101
(svn r10117) -Fix [FS#863]: When deleting the vehicles of bankrupt players, delete trains as
maedhros
parents:
6857
diff
changeset
|
409 |
} |
0 | 410 |
} else { |
411 |
v->owner = new_player; |
|
8186
6ebffac017be
(svn r11749) -Fix (r11352): when a bankrupted company is bought, reset vehicle color mapping so the vehicles use the new owner color
glx
parents:
8157
diff
changeset
|
412 |
v->colormap = PAL_NONE; |
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
|
413 |
v->group_id = DEFAULT_GROUP; |
4621
47100a78dbd3
(svn r6479) -Fix r6424: FS#348 Plane autoreplace glitch
bjarni
parents:
4549
diff
changeset
|
414 |
if (IsEngineCountable(v)) GetPlayer(new_player)->num_engines[v->engine_type]++; |
2989 | 415 |
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
|
416 |
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
|
417 |
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
|
418 |
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
|
419 |
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
|
420 |
default: NOT_REACHED(); |
2989 | 421 |
} |
0 | 422 |
} |
423 |
} |
|
424 |
} |
|
425 |
} |
|
426 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
427 |
/* Change ownership of tiles */ |
0 | 428 |
{ |
1797
fa156be69235
(svn r2301) - CodeChange: prettyify ChangeOwnerShipOfPlayerItems() a bit
Darkvater
parents:
1793
diff
changeset
|
429 |
TileIndex tile = 0; |
0 | 430 |
do { |
431 |
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
|
432 |
} while (++tile != MapSize()); |
8200
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
433 |
|
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
434 |
if (new_player != PLAYER_SPECTATOR) { |
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
435 |
/* Update all signals because there can be new segment that was owned by two players |
8342
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8306
diff
changeset
|
436 |
* and signals were not propagated |
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8306
diff
changeset
|
437 |
* Similiar with crossings - it is needed to bar crossings that weren't before |
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8306
diff
changeset
|
438 |
* because of different owner of crossing and approaching train */ |
8200
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
439 |
tile = 0; |
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
440 |
|
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
441 |
do { |
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
442 |
if (IsTileType(tile, MP_RAILWAY) && IsTileOwner(tile, new_player) && HasSignals(tile)) { |
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
443 |
TrackBits tracks = GetTrackBits(tile); |
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
444 |
do { // there may be two tracks with signals for TRACK_BIT_HORZ and TRACK_BIT_VERT |
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
445 |
Track track = RemoveFirstTrack(&tracks); |
8306
22e1344c5457
(svn r11871) -Fix [FS#1074]: do not update signals after each tile when building/removing a large block of track/signals/station
smatz
parents:
8302
diff
changeset
|
446 |
if (HasSignalOnTrack(tile, track)) AddTrackToSignalBuffer(tile, track, new_player); |
8200
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
447 |
} while (tracks != TRACK_BIT_NONE); |
8342
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8306
diff
changeset
|
448 |
} else if (IsLevelCrossingTile(tile) && IsTileOwner(tile, new_player)) { |
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8306
diff
changeset
|
449 |
UpdateLevelCrossing(tile); |
8200
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
450 |
} |
633e55a3ca3d
(svn r11763) -Fix: update signal states after merging a company
smatz
parents:
8186
diff
changeset
|
451 |
} while (++tile != MapSize()); |
8347
7edfa9e0c8ad
(svn r11913) -Fix (r11871): update signals after company bankrupt and disaster too
smatz
parents:
8342
diff
changeset
|
452 |
} |
8306
22e1344c5457
(svn r11871) -Fix [FS#1074]: do not update signals after each tile when building/removing a large block of track/signals/station
smatz
parents:
8302
diff
changeset
|
453 |
|
8347
7edfa9e0c8ad
(svn r11913) -Fix (r11871): update signals after company bankrupt and disaster too
smatz
parents:
8342
diff
changeset
|
454 |
/* update signals in buffer */ |
7edfa9e0c8ad
(svn r11913) -Fix (r11871): update signals after company bankrupt and disaster too
smatz
parents:
8342
diff
changeset
|
455 |
UpdateSignalsInBuffer(); |
0 | 456 |
} |
457 |
||
9058
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
458 |
/* In all cases clear replace engine rules. |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
459 |
* Even if it was copied, it could interfere with new owner's rules */ |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
460 |
RemoveAllEngineReplacementForPlayer(GetPlayer(old_player)); |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
461 |
|
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
462 |
if (new_player == PLAYER_SPECTATOR) { |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
463 |
RemoveAllGroupsForPlayer(old_player); |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
464 |
} else { |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
465 |
Group *g; |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
466 |
FOR_ALL_GROUPS(g) { |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
467 |
if (g->owner == old_player) g->owner = new_player; |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
468 |
} |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
469 |
} |
25cfd71b68e6
(svn r12906) -Fix: vehicle groups, engine replacement rules and player/company names were not properly reset/freed after bankrupt (before new player start)
smatz
parents:
9043
diff
changeset
|
470 |
|
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
|
471 |
/* 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
|
472 |
if (new_player != PLAYER_SPECTATOR) ChangeWindowOwner(old_player, new_player); |
0 | 473 |
|
474 |
_current_player = old; |
|
475 |
||
476 |
MarkWholeScreenDirty(); |
|
477 |
} |
|
478 |
||
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
|
479 |
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
|
480 |
{ |
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
|
481 |
#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
|
482 |
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
|
483 |
|
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
|
484 |
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
|
485 |
_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
|
486 |
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
|
487 |
} |
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
|
488 |
|
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
|
489 |
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
|
490 |
|
9428
1ba05b499957
(svn r13343) -Codechange: reorder/move variable/functions in the network headers so that nothing from the network directory needs to include basically all network headers.
rubidium
parents:
9413
diff
changeset
|
491 |
NetworkServerChangeOwner(current_player, new_player); |
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
|
492 |
#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
|
493 |
} |
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
|
494 |
|
0 | 495 |
static void PlayersCheckBankrupt(Player *p) |
496 |
{ |
|
2475 | 497 |
PlayerID owner; |
0 | 498 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
499 |
/* If the player has money again, it does not go bankrupt */ |
0 | 500 |
if (p->player_money >= 0) { |
501 |
p->quarters_of_bankrupcy = 0; |
|
502 |
return; |
|
503 |
} |
|
504 |
||
505 |
p->quarters_of_bankrupcy++; |
|
506 |
||
507 |
owner = p->index; |
|
508 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
509 |
switch (p->quarters_of_bankrupcy) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
510 |
case 2: |
9199
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
511 |
SetDParam(0, STR_7056_TRANSPORT_COMPANY_IN_TROUBLE); |
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
512 |
SetDParam(1, STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED); |
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
513 |
SetDParam(2, owner); |
9257
8933adfe564f
(svn r13123) -Codechange: passing the bankrupt type via data_b is not needed anymore. Patch by Cirdan.
rubidium
parents:
9236
diff
changeset
|
514 |
AddNewsItem(STR_02B6, NS_COMPANY_TROUBLE, 0, owner); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
515 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
516 |
case 3: { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
517 |
/* 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
|
518 |
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
|
519 |
if (IsHumanPlayer(owner)) { |
9199
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
520 |
SetDParam(0, STR_7056_TRANSPORT_COMPANY_IN_TROUBLE); |
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
521 |
SetDParam(1, STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED); |
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
522 |
SetDParam(2, owner); |
9257
8933adfe564f
(svn r13123) -Codechange: passing the bankrupt type via data_b is not needed anymore. Patch by Cirdan.
rubidium
parents:
9236
diff
changeset
|
523 |
AddNewsItem(STR_02B6, NS_COMPANY_TROUBLE, 0, owner); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
524 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
525 |
} |
0 | 526 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
527 |
/* 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
|
528 |
* right now */ |
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
529 |
Money val = CalculateCompanyValue(p); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
530 |
if (val > 0) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
531 |
p->bankrupt_value = val; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
532 |
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
|
533 |
p->bankrupt_timeout = 0; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
534 |
break; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
535 |
} |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
536 |
/* Else, falltrue to case 4... */ |
0 | 537 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
538 |
case 4: { |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
539 |
/* Close everything the owner has open */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
540 |
DeletePlayerWindows(owner); |
0 | 541 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
542 |
/* Show bankrupt news */ |
9199
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
543 |
SetDParam(0, STR_705C_BANKRUPT); |
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
544 |
SetDParam(1, STR_705D_HAS_BEEN_CLOSED_DOWN_BY); |
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
545 |
SetDParam(2, p->index); |
9257
8933adfe564f
(svn r13123) -Codechange: passing the bankrupt type via data_b is not needed anymore. Patch by Cirdan.
rubidium
parents:
9236
diff
changeset
|
546 |
AddNewsItem(STR_02B6, NS_COMPANY_BANKRUPT, 0, owner); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
547 |
|
5067
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
548 |
if (IsHumanPlayer(owner)) { |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
549 |
/* 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
|
550 |
* 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
|
551 |
* 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
|
552 |
if (!_networking) { |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
553 |
p->bankrupt_asked = 0xFF; |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
554 |
p->bankrupt_timeout = 0x456; |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
555 |
break; |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
556 |
} |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
557 |
|
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
|
558 |
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
|
559 |
} |
687
0e42e732ad78
(svn r1128) -Fix: [Network] Going bankrupt of human-players was corrupted in networkgames
truelight
parents:
679
diff
changeset
|
560 |
|
5067
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
561 |
/* Remove the player */ |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
562 |
ChangeOwnershipOfPlayerItems(owner, PLAYER_SPECTATOR); |
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
563 |
/* 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
|
564 |
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
|
565 |
|
5067
f3816e74ad32
(svn r7125) -Fix: Several errors/glitches related to multiplayer and bankrupcy, mainly such a
Darkvater
parents:
4880
diff
changeset
|
566 |
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
|
567 |
AI_PlayerDied(owner); |
0 | 568 |
} |
569 |
} |
|
570 |
} |
|
571 |
||
6247 | 572 |
static void PlayersGenStatistics() |
0 | 573 |
{ |
574 |
Station *st; |
|
575 |
Player *p; |
|
576 |
||
577 |
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
|
578 |
_current_player = st->owner; |
8230
64f28fe2d5c8
(svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114).
rubidium
parents:
8224
diff
changeset
|
579 |
CommandCost cost(EXPENSES_PROPERTY, _price.station_value >> 1); |
64f28fe2d5c8
(svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114).
rubidium
parents:
8224
diff
changeset
|
580 |
SubtractMoneyFromPlayer(cost); |
0 | 581 |
} |
582 |
||
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7926
diff
changeset
|
583 |
if (!HasBit(1<<0|1<<3|1<<6|1<<9, _cur_month)) |
0 | 584 |
return; |
585 |
||
586 |
FOR_ALL_PLAYERS(p) { |
|
587 |
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
|
588 |
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
|
589 |
p->old_economy[0] = p->cur_economy; |
0 | 590 |
memset(&p->cur_economy, 0, sizeof(p->cur_economy)); |
591 |
||
5426
d3d5733c5e3a
(svn r7630) -Fix: At the end of the quarter the old economy numbers were shifted up, and
Darkvater
parents:
5378
diff
changeset
|
592 |
if (p->num_valid_stat_ent != 24) p->num_valid_stat_ent++; |
0 | 593 |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
33
diff
changeset
|
594 |
UpdateCompanyRatingAndValue(p, true); |
0 | 595 |
PlayersCheckBankrupt(p); |
596 |
||
5426
d3d5733c5e3a
(svn r7630) -Fix: At the end of the quarter the old economy numbers were shifted up, and
Darkvater
parents:
5378
diff
changeset
|
597 |
if (p->block_preview != 0) p->block_preview--; |
0 | 598 |
} |
599 |
} |
|
600 |
||
601 |
InvalidateWindow(WC_INCOME_GRAPH, 0); |
|
602 |
InvalidateWindow(WC_OPERATING_PROFIT, 0); |
|
603 |
InvalidateWindow(WC_DELIVERED_CARGO, 0); |
|
604 |
InvalidateWindow(WC_PERFORMANCE_HISTORY, 0); |
|
605 |
InvalidateWindow(WC_COMPANY_VALUE, 0); |
|
606 |
InvalidateWindow(WC_COMPANY_LEAGUE, 0); |
|
607 |
} |
|
608 |
||
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
609 |
static void AddSingleInflation(Money *value, uint16 *frac, int32 amt) |
0 | 610 |
{ |
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
611 |
/* Is it safe to add inflation ? */ |
6957
a9af2426bf77
(svn r10212) -Fix [FS#723]: money overflow bugs in many locations.
rubidium
parents:
6955
diff
changeset
|
612 |
if ((INT64_MAX / amt) < (*value + 1)) { |
a9af2426bf77
(svn r10212) -Fix [FS#723]: money overflow bugs in many locations.
rubidium
parents:
6955
diff
changeset
|
613 |
*value = INT64_MAX / amt; |
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
614 |
*frac = 0; |
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
615 |
} else { |
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
616 |
int64 tmp = (int64)*value * amt + *frac; |
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
617 |
*frac = GB(tmp, 0, 16); |
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
618 |
*value += tmp >> 16; |
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
619 |
} |
0 | 620 |
} |
621 |
||
6247 | 622 |
static void AddInflation() |
0 | 623 |
{ |
7244
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
624 |
/* The cargo payment inflation differs from the normal inflation, so the |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
625 |
* relative amount of money you make with a transport decreases slowly over |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
626 |
* the 170 years. After a few hundred years we reach a level in which the |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
627 |
* games will become unplayable as the maximum income will be less than |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
628 |
* the minimum running cost. |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
629 |
* |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
630 |
* Furthermore there are a lot of inflation related overflows all over the |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
631 |
* place. Solving them is hardly possible because inflation will always |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
632 |
* reach the overflow threshold some day. So we'll just perform the |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
633 |
* inflation mechanism during the first 170 years (the amount of years that |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
634 |
* one had in the original TTD) and stop doing the inflation after that |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
635 |
* because it only causes problems that can't be solved nicely and the |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
636 |
* inflation doesn't add anything after that either; it even makes playing |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
637 |
* it impossible due to the diverging cost and income rates. |
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
638 |
*/ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
639 |
if ((_cur_year - _settings_game.game_creation.starting_year) >= (ORIGINAL_MAX_YEAR - ORIGINAL_BASE_YEAR)) return; |
7244
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
640 |
|
6119 | 641 |
/* Approximation for (100 + infl_amount)% ** (1 / 12) - 100% |
642 |
* scaled by 65536 |
|
643 |
* 12 -> months per year |
|
644 |
* This is only a good approxiamtion for small values |
|
645 |
*/ |
|
9438
e6aa429e06fc
(svn r13356) -Codechange: Incorrect documentation and variable type for inflation rates
peter1138
parents:
9428
diff
changeset
|
646 |
int32 inf = _economy.infl_amount * 54; |
0 | 647 |
|
6119 | 648 |
for (uint i = 0; i != NUM_PRICES; i++) { |
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
649 |
AddSingleInflation((Money*)&_price + i, _price_frac + i, inf); |
0 | 650 |
} |
651 |
||
7244
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
652 |
AddSingleInflation(&_economy.max_loan_unround, &_economy.max_loan_unround_fract, inf); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
653 |
|
7244
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
654 |
if (_economy.max_loan + 50000 <= _economy.max_loan_unround) _economy.max_loan += 50000; |
0 | 655 |
|
656 |
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
|
657 |
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
|
658 |
AddSingleInflation( |
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
659 |
(Money*)_cargo_payment_rates + i, |
0 | 660 |
_cargo_payment_rates_frac + i, |
661 |
inf |
|
662 |
); |
|
663 |
} |
|
664 |
||
665 |
InvalidateWindowClasses(WC_BUILD_VEHICLE); |
|
1098
dac6a13ff91d
(svn r1599) fix: autoreplace window now updates when inflation alters prices
bjarni
parents:
1093
diff
changeset
|
666 |
InvalidateWindowClasses(WC_REPLACE_VEHICLE); |
0 | 667 |
InvalidateWindowClasses(WC_VEHICLE_DETAILS); |
668 |
InvalidateWindow(WC_PAYMENT_RATES, 0); |
|
669 |
} |
|
670 |
||
6247 | 671 |
static void PlayersPayInterest() |
0 | 672 |
{ |
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
|
673 |
const Player* p; |
0 | 674 |
int interest = _economy.interest_rate * 54; |
675 |
||
676 |
FOR_ALL_PLAYERS(p) { |
|
2639 | 677 |
if (!p->is_active) continue; |
0 | 678 |
|
679 |
_current_player = p->index; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
680 |
|
8230
64f28fe2d5c8
(svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114).
rubidium
parents:
8224
diff
changeset
|
681 |
SubtractMoneyFromPlayer(CommandCost(EXPENSES_LOAN_INT, (Money)BigMulSU(p->current_loan, interest, 16))); |
0 | 682 |
|
8230
64f28fe2d5c8
(svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114).
rubidium
parents:
8224
diff
changeset
|
683 |
SubtractMoneyFromPlayer(CommandCost(EXPENSES_OTHER, _price.station_value >> 2)); |
0 | 684 |
} |
685 |
} |
|
686 |
||
6247 | 687 |
static void HandleEconomyFluctuations() |
0 | 688 |
{ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
689 |
if (_settings_game.difficulty.economy == 0) return; |
0 | 690 |
|
691 |
if (--_economy.fluct == 0) { |
|
2642 | 692 |
_economy.fluct = -(int)GB(Random(), 0, 2); |
9234
bfc9d27d3d0d
(svn r13100) -Codechange: reduce the amount of parameters passed via AddNewsMessage as there is (for each news message type) a tuple of 4 parameters that is the same for all calls.
rubidium
parents:
9199
diff
changeset
|
693 |
AddNewsItem(STR_7073_WORLD_RECESSION_FINANCIAL, NS_ECONOMY, 0, 0); |
0 | 694 |
} else if (_economy.fluct == -12) { |
2642 | 695 |
_economy.fluct = GB(Random(), 0, 8) + 312; |
9234
bfc9d27d3d0d
(svn r13100) -Codechange: reduce the amount of parameters passed via AddNewsMessage as there is (for each news message type) a tuple of 4 parameters that is the same for all calls.
rubidium
parents:
9199
diff
changeset
|
696 |
AddNewsItem(STR_7074_RECESSION_OVER_UPTURN_IN, NS_ECONOMY, 0, 0); |
0 | 697 |
} |
698 |
} |
|
699 |
||
700 |
static byte _price_category[NUM_PRICES] = { |
|
701 |
0, 2, 2, 2, 2, 2, 2, 2, |
|
702 |
2, 2, 2, 2, 2, 2, 2, 2, |
|
703 |
2, 2, 2, 2, 2, 2, 2, 2, |
|
704 |
2, 2, 2, 2, 2, 2, 2, 2, |
|
705 |
2, 2, 2, 2, 2, 2, 2, 2, |
|
706 |
2, 2, 1, 1, 1, 1, 1, 1, |
|
707 |
2, |
|
708 |
}; |
|
709 |
||
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
710 |
static const Money _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
|
711 |
100, ///< station_value |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
712 |
100, ///< build_rail |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
713 |
95, ///< build_road |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
714 |
65, ///< build_signals |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
715 |
275, ///< build_bridge |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
716 |
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
|
717 |
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
|
718 |
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
|
719 |
450, ///< build_tunnel |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
720 |
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
|
721 |
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
|
722 |
600, ///< build_airport |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
723 |
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
|
724 |
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
|
725 |
350, ///< build_dock |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
726 |
400000, ///< build_railvehicle |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
727 |
2000, ///< build_railwagon |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
728 |
700000, ///< aircraft_base |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
729 |
14000, ///< roadveh_base |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
730 |
65000, ///< ship_base |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
731 |
20, ///< build_trees |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
732 |
250, ///< terraform |
7977
4a4e11757be5
(svn r11533) -Codechange: Rename some unclear clear_x prices member names.
belugas
parents:
7967
diff
changeset
|
733 |
20, ///< clear_grass |
4a4e11757be5
(svn r11533) -Codechange: Rename some unclear clear_x prices member names.
belugas
parents:
7967
diff
changeset
|
734 |
40, ///< clear_roughland |
4a4e11757be5
(svn r11533) -Codechange: Rename some unclear clear_x prices member names.
belugas
parents:
7967
diff
changeset
|
735 |
200, ///< clear_rocks |
4a4e11757be5
(svn r11533) -Codechange: Rename some unclear clear_x prices member names.
belugas
parents:
7967
diff
changeset
|
736 |
500, ///< clear_fields |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
737 |
20, ///< remove_trees |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
738 |
-70, ///< remove_rail |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
739 |
10, ///< remove_signals |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
740 |
50, ///< clear_bridge |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
741 |
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
|
742 |
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
|
743 |
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
|
744 |
30, ///< clear_tunnel |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
745 |
10000, ///< clear_water |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
746 |
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
|
747 |
30, ///< remove_airport |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
748 |
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
|
749 |
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
|
750 |
55, ///< remove_dock |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
751 |
1600, ///< remove_house |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
752 |
40, ///< remove_road |
8624
01b74528e7f6
(svn r12207) -Change: rail running costs are engine class, not rail type
peter1138
parents:
8614
diff
changeset
|
753 |
5600, ///< running_rail[0] steam |
01b74528e7f6
(svn r12207) -Change: rail running costs are engine class, not rail type
peter1138
parents:
8614
diff
changeset
|
754 |
5200, ///< running_rail[1] diesel |
01b74528e7f6
(svn r12207) -Change: rail running costs are engine class, not rail type
peter1138
parents:
8614
diff
changeset
|
755 |
4800, ///< running_rail[2] electric |
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
756 |
9600, ///< aircraft_running |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
757 |
1600, ///< roadveh_running |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
758 |
5600, ///< ship_running |
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
759 |
1000000, ///< build_industry |
0 | 760 |
}; |
761 |
||
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
762 |
static byte price_base_multiplier[NUM_PRICES]; |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
763 |
|
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
764 |
/** |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
765 |
* Reset changes to the price base multipliers. |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
766 |
*/ |
6247 | 767 |
void ResetPriceBaseMultipliers() |
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
768 |
{ |
2508
1926793f2977
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
769 |
uint i; |
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
770 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
771 |
/* 8 means no multiplier. */ |
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
772 |
for (i = 0; i < NUM_PRICES; i++) |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
773 |
price_base_multiplier[i] = 8; |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
774 |
} |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
775 |
|
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
776 |
/** |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
777 |
* Change a price base by the given factor. |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
778 |
* 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
|
779 |
* NewBaseCost = OldBaseCost * 2^(n-8) |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
780 |
* @param price Index of price base to change. |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
781 |
* @param factor Amount to change by. |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
782 |
*/ |
2508
1926793f2977
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
783 |
void SetPriceBaseMultiplier(uint price, byte factor) |
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
784 |
{ |
2508
1926793f2977
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
785 |
assert(price < NUM_PRICES); |
1926793f2977
(svn r3034) -NewGRF: Improve error checking of setting price bases.
peter1138
parents:
2506
diff
changeset
|
786 |
price_base_multiplier[price] = factor; |
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
787 |
} |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
788 |
|
6247 | 789 |
void StartupEconomy() |
0 | 790 |
{ |
791 |
int i; |
|
792 |
||
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
793 |
assert(sizeof(_price) == NUM_PRICES * sizeof(Money)); |
0 | 794 |
|
2952 | 795 |
for (i = 0; i != NUM_PRICES; i++) { |
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
796 |
Money price = _price_base[i]; |
0 | 797 |
if (_price_category[i] != 0) { |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
798 |
uint mod = _price_category[i] == 1 ? _settings_game.difficulty.vehicle_costs : _settings_game.difficulty.construction_cost; |
0 | 799 |
if (mod < 1) { |
800 |
price = price * 3 >> 2; |
|
801 |
} else if (mod > 1) { |
|
802 |
price = price * 9 >> 3; |
|
803 |
} |
|
804 |
} |
|
2506
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
805 |
if (price_base_multiplier[i] > 8) { |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
806 |
price <<= price_base_multiplier[i] - 8; |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
807 |
} else { |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
808 |
price >>= 8 - price_base_multiplier[i]; |
eca87f30e05a
(svn r3032) -NewGRF, Feature: Add support for changing base prices.
peter1138
parents:
2504
diff
changeset
|
809 |
} |
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
810 |
((Money*)&_price)[i] = price; |
0 | 811 |
_price_frac[i] = 0; |
812 |
} |
|
813 |
||
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
814 |
_economy.interest_rate = _settings_game.difficulty.initial_interest; |
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
815 |
_economy.infl_amount = _settings_game.difficulty.initial_interest; |
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
816 |
_economy.infl_amount_pr = max(0, _settings_game.difficulty.initial_interest - 1); |
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
817 |
_economy.max_loan_unround = _economy.max_loan = _settings_game.difficulty.max_loan; |
2150
f710b959b1c4
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2070
diff
changeset
|
818 |
_economy.fluct = GB(Random(), 0, 8) + 168; |
0 | 819 |
} |
820 |
||
8626
9781464622be
(svn r12209) -Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, and show running cost of wagons if they have it.
peter1138
parents:
8624
diff
changeset
|
821 |
|
9781464622be
(svn r12209) -Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, and show running cost of wagons if they have it.
peter1138
parents:
8624
diff
changeset
|
822 |
Money GetPriceByIndex(uint8 index) |
9781464622be
(svn r12209) -Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, and show running cost of wagons if they have it.
peter1138
parents:
8624
diff
changeset
|
823 |
{ |
9781464622be
(svn r12209) -Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, and show running cost of wagons if they have it.
peter1138
parents:
8624
diff
changeset
|
824 |
if (index > NUM_PRICES) return 0; |
9781464622be
(svn r12209) -Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, and show running cost of wagons if they have it.
peter1138
parents:
8624
diff
changeset
|
825 |
|
9781464622be
(svn r12209) -Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, and show running cost of wagons if they have it.
peter1138
parents:
8624
diff
changeset
|
826 |
return ((Money*)&_price)[index]; |
9781464622be
(svn r12209) -Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, and show running cost of wagons if they have it.
peter1138
parents:
8624
diff
changeset
|
827 |
} |
9781464622be
(svn r12209) -Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, and show running cost of wagons if they have it.
peter1138
parents:
8624
diff
changeset
|
828 |
|
9781464622be
(svn r12209) -Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, and show running cost of wagons if they have it.
peter1138
parents:
8624
diff
changeset
|
829 |
|
2630 | 830 |
Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode) |
0 | 831 |
{ |
1977
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1962
diff
changeset
|
832 |
TileIndex tile; |
37bbebf94434
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1962
diff
changeset
|
833 |
TileIndex tile2; |
0 | 834 |
Pair tp; |
835 |
||
2272
8b32b48b8579
(svn r2794) Fix a comment and get rid of some parentheses using DeMorgan's law
tron
parents:
2261
diff
changeset
|
836 |
/* 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
|
837 |
const CargoSpec *cs = GetCargo(s->cargo_type); |
7287
88e6b96765d6
(svn r10628) -Fix (r10606,FS#1055): Revert r10606 and fix the plural problem another way.
peter1138
parents:
7266
diff
changeset
|
838 |
SetDParam(0, mode ? cs->name : cs->name_single); |
0 | 839 |
|
840 |
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
|
841 |
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
|
842 |
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
|
843 |
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
|
844 |
tile = GetIndustry(s->from)->xy; |
0 | 845 |
|
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
846 |
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
|
847 |
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
|
848 |
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
|
849 |
tile2 = GetIndustry(s->to)->xy; |
0 | 850 |
} 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
|
851 |
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
|
852 |
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
|
853 |
tile2 = GetTown(s->to)->xy; |
0 | 854 |
} |
855 |
} 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
|
856 |
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
|
857 |
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
|
858 |
tile = GetTown(s->from)->xy; |
0 | 859 |
|
2070
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
860 |
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
|
861 |
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
|
862 |
tile2 = GetTown(s->to)->xy; |
0 | 863 |
} |
864 |
} 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
|
865 |
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
|
866 |
tile = GetStation(s->from)->xy; |
0 | 867 |
|
2070
47b1f29d4671
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
2063
diff
changeset
|
868 |
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
|
869 |
tile2 = GetStation(s->to)->xy; |
0 | 870 |
} |
871 |
||
872 |
tp.a = tile; |
|
873 |
tp.b = tile2; |
|
874 |
||
875 |
return tp; |
|
876 |
} |
|
877 |
||
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
|
878 |
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
|
879 |
{ |
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
|
880 |
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
|
881 |
|
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
|
882 |
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
|
883 |
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
|
884 |
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
|
885 |
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
|
886 |
((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
|
887 |
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
|
888 |
} |
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
|
889 |
} |
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
|
890 |
} |
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
|
891 |
} |
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
|
892 |
|
4330
cf31daa8b321
(svn r6005) -Cleanup: introduce IndustryID and use it
rubidium
parents:
4329
diff
changeset
|
893 |
void DeleteSubsidyWithIndustry(IndustryID index) |
0 | 894 |
{ |
895 |
Subsidy *s; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
896 |
|
2952 | 897 |
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
|
898 |
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
|
899 |
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
|
900 |
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
|
901 |
(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
|
902 |
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
|
903 |
} |
0 | 904 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
905 |
} |
0 | 906 |
} |
907 |
||
4330
cf31daa8b321
(svn r6005) -Cleanup: introduce IndustryID and use it
rubidium
parents:
4329
diff
changeset
|
908 |
void DeleteSubsidyWithStation(StationID index) |
0 | 909 |
{ |
910 |
Subsidy *s; |
|
911 |
bool dirty = false; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
912 |
|
2952 | 913 |
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
|
914 |
if (s->cargo_type != CT_INVALID && s->age >= 12 && |
0 | 915 |
(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
|
916 |
s->cargo_type = CT_INVALID; |
0 | 917 |
dirty = true; |
918 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
919 |
} |
0 | 920 |
|
921 |
if (dirty) |
|
922 |
InvalidateWindow(WC_SUBSIDIES_LIST, 0); |
|
923 |
} |
|
924 |
||
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
925 |
struct FoundRoute { |
0 | 926 |
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
|
927 |
CargoID cargo; |
0 | 928 |
void *from; |
929 |
void *to; |
|
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
930 |
}; |
0 | 931 |
|
932 |
static void FindSubsidyPassengerRoute(FoundRoute *fr) |
|
933 |
{ |
|
934 |
Town *from,*to; |
|
935 |
||
936 |
fr->distance = (uint)-1; |
|
937 |
||
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
|
938 |
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
|
939 |
if (from == NULL || from->population < 400) return; |
0 | 940 |
|
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
|
941 |
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
|
942 |
if (from == to || to == NULL || to->population < 400 || to->pct_pass_transported > 42) |
0 | 943 |
return; |
944 |
||
1245
3822f77cbc53
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1098
diff
changeset
|
945 |
fr->distance = DistanceManhattan(from->xy, to->xy); |
0 | 946 |
} |
947 |
||
948 |
static void FindSubsidyCargoRoute(FoundRoute *fr) |
|
949 |
{ |
|
950 |
Industry *i; |
|
951 |
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
|
952 |
CargoID cargo; |
0 | 953 |
|
954 |
fr->distance = (uint)-1; |
|
955 |
||
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
|
956 |
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
|
957 |
if (i == NULL) return; |
0 | 958 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
959 |
/* Randomize cargo type */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7926
diff
changeset
|
960 |
if (HasBit(Random(), 0) && i->produced_cargo[1] != CT_INVALID) { |
7645
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7642
diff
changeset
|
961 |
cargo = i->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
|
962 |
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
|
963 |
total = i->last_month_production[1]; |
0 | 964 |
} else { |
7645
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7642
diff
changeset
|
965 |
cargo = i->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
|
966 |
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
|
967 |
total = i->last_month_production[0]; |
0 | 968 |
} |
969 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
970 |
/* 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
|
971 |
* 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
|
972 |
* 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
|
973 |
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
|
974 |
|
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
975 |
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
|
976 |
if (cs->town_effect == TE_PASSENGERS) return; |
0 | 977 |
|
978 |
fr->cargo = cargo; |
|
979 |
||
6315
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
980 |
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
|
981 |
/* 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
|
982 |
Town *t = GetRandomTown(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
983 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
984 |
/* 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
|
985 |
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
|
986 |
|
1245
3822f77cbc53
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1098
diff
changeset
|
987 |
fr->distance = DistanceManhattan(i->xy, t->xy); |
0 | 988 |
fr->to = t; |
989 |
} else { |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
990 |
/* 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
|
991 |
Industry *i2 = GetRandomIndustry(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
992 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
993 |
/* The industry must accept the cargo */ |
7645
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7642
diff
changeset
|
994 |
if (i2 == NULL || i == i2 || |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7642
diff
changeset
|
995 |
(cargo != i2->accepts_cargo[0] && |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7642
diff
changeset
|
996 |
cargo != i2->accepts_cargo[1] && |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7642
diff
changeset
|
997 |
cargo != i2->accepts_cargo[2])) { |
0 | 998 |
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
|
999 |
} |
1245
3822f77cbc53
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
tron
parents:
1098
diff
changeset
|
1000 |
fr->distance = DistanceManhattan(i->xy, i2->xy); |
0 | 1001 |
fr->to = i2; |
1002 |
} |
|
1003 |
} |
|
1004 |
||
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1005 |
static bool CheckSubsidyDuplicate(Subsidy *s) |
0 | 1006 |
{ |
2630 | 1007 |
const Subsidy* ss; |
0 | 1008 |
|
2639 | 1009 |
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
|
1010 |
if (s != ss && |
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1011 |
ss->from == s->from && |
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1012 |
ss->to == s->to && |
0 | 1013 |
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
|
1014 |
s->cargo_type = CT_INVALID; |
0 | 1015 |
return true; |
1016 |
} |
|
1017 |
} |
|
1018 |
return false; |
|
1019 |
} |
|
1020 |
||
239 | 1021 |
|
6247 | 1022 |
static void SubsidyMonthlyHandler() |
0 | 1023 |
{ |
1024 |
Subsidy *s; |
|
1025 |
Pair pair; |
|
1026 |
Station *st; |
|
1027 |
uint n; |
|
1028 |
FoundRoute fr; |
|
1029 |
bool modified = false; |
|
1030 |
||
2952 | 1031 |
for (s = _subsidies; s != endof(_subsidies); s++) { |
1032 |
if (s->cargo_type == CT_INVALID) continue; |
|
0 | 1033 |
|
1034 |
if (s->age == 12-1) { |
|
1035 |
pair = SetupSubsidyDecodeParam(s, 1); |
|
9234
bfc9d27d3d0d
(svn r13100) -Codechange: reduce the amount of parameters passed via AddNewsMessage as there is (for each news message type) a tuple of 4 parameters that is the same for all calls.
rubidium
parents:
9199
diff
changeset
|
1036 |
AddNewsItem(STR_202E_OFFER_OF_SUBSIDY_EXPIRED, NS_SUBSIDIES, 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
|
1037 |
s->cargo_type = CT_INVALID; |
0 | 1038 |
modified = true; |
1039 |
} 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
|
1040 |
st = GetStation(s->to); |
0 | 1041 |
if (st->owner == _local_player) { |
1042 |
pair = SetupSubsidyDecodeParam(s, 1); |
|
9234
bfc9d27d3d0d
(svn r13100) -Codechange: reduce the amount of parameters passed via AddNewsMessage as there is (for each news message type) a tuple of 4 parameters that is the same for all calls.
rubidium
parents:
9199
diff
changeset
|
1043 |
AddNewsItem(STR_202F_SUBSIDY_WITHDRAWN_SERVICE, NS_SUBSIDIES, pair.a, pair.b); |
0 | 1044 |
} |
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 |
modified = true; |
1047 |
} else { |
|
1048 |
s->age++; |
|
1049 |
} |
|
1050 |
} |
|
1051 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1052 |
/* 25% chance to go on */ |
7967
a230c063a672
(svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
skidd13
parents:
7954
diff
changeset
|
1053 |
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
|
1054 |
/* Find a free slot*/ |
0 | 1055 |
s = _subsidies; |
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1056 |
while (s->cargo_type != CT_INVALID) { |
0 | 1057 |
if (++s == endof(_subsidies)) |
1058 |
goto no_add; |
|
1059 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1060 |
|
0 | 1061 |
n = 1000; |
1062 |
do { |
|
1063 |
FindSubsidyPassengerRoute(&fr); |
|
1064 |
if (fr.distance <= 70) { |
|
1065 |
s->cargo_type = CT_PASSENGERS; |
|
1066 |
s->from = ((Town*)fr.from)->index; |
|
1067 |
s->to = ((Town*)fr.to)->index; |
|
1068 |
goto add_subsidy; |
|
1069 |
} |
|
1070 |
FindSubsidyCargoRoute(&fr); |
|
1071 |
if (fr.distance <= 70) { |
|
1072 |
s->cargo_type = fr.cargo; |
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
863
diff
changeset
|
1073 |
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
|
1074 |
{ |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1075 |
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
|
1076 |
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
|
1077 |
} |
0 | 1078 |
add_subsidy: |
1079 |
if (!CheckSubsidyDuplicate(s)) { |
|
1080 |
s->age = 0; |
|
1081 |
pair = SetupSubsidyDecodeParam(s, 0); |
|
9234
bfc9d27d3d0d
(svn r13100) -Codechange: reduce the amount of parameters passed via AddNewsMessage as there is (for each news message type) a tuple of 4 parameters that is the same for all calls.
rubidium
parents:
9199
diff
changeset
|
1082 |
AddNewsItem(STR_2030_SERVICE_SUBSIDY_OFFERED, NS_SUBSIDIES, pair.a, pair.b); |
0 | 1083 |
modified = true; |
1084 |
break; |
|
1085 |
} |
|
1086 |
} |
|
239 | 1087 |
} while (n--); |
0 | 1088 |
} |
1089 |
no_add:; |
|
1090 |
if (modified) |
|
1091 |
InvalidateWindow(WC_SUBSIDIES_LIST, 0); |
|
1092 |
} |
|
1093 |
||
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
|
1094 |
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
|
1095 |
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
|
1096 |
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
|
1097 |
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
|
1098 |
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
|
1099 |
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
|
1100 |
SLE_CONDVAR(Subsidy, to, SLE_UINT16, 5, SL_MAX_VERSION), |
0 | 1101 |
SLE_END() |
1102 |
}; |
|
1103 |
||
6247 | 1104 |
static void Save_SUBS() |
0 | 1105 |
{ |
1106 |
int i; |
|
1107 |
Subsidy *s; |
|
1108 |
||
2952 | 1109 |
for (i = 0; i != lengthof(_subsidies); i++) { |
0 | 1110 |
s = &_subsidies[i]; |
2469
59a0073914d8
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
1111 |
if (s->cargo_type != CT_INVALID) { |
0 | 1112 |
SlSetArrayIndex(i); |
1113 |
SlObject(s, _subsidies_desc); |
|
1114 |
} |
|
1115 |
} |
|
1116 |
} |
|
1117 |
||
6247 | 1118 |
static void Load_SUBS() |
0 | 1119 |
{ |
1120 |
int index; |
|
1121 |
while ((index = SlIterateArray()) != -1) |
|
1122 |
SlObject(&_subsidies[index], _subsidies_desc); |
|
1123 |
} |
|
1124 |
||
6954
76ad0c521767
(svn r10209) -Fix/Codechange: forgot a few changes of int32 -> Money in the previous commit
rubidium
parents:
6953
diff
changeset
|
1125 |
Money GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type) |
0 | 1126 |
{ |
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
|
1127 |
const CargoSpec *cs = GetCargo(cargo_type); |
0 | 1128 |
|
6458
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1129 |
/* Use callback to calculate cargo profit, if available */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7926
diff
changeset
|
1130 |
if (HasBit(cs->callback_mask, CBM_CARGO_PROFIT_CALC)) { |
6458
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1131 |
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
|
1132 |
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
|
1133 |
if (callback != CALLBACK_FAILED) { |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1134 |
int result = GB(callback, 0, 14); |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1135 |
|
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1136 |
/* Simulate a 15 bit signed value */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7926
diff
changeset
|
1137 |
if (HasBit(callback, 14)) result = 0x4000 - result; |
6458
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1138 |
|
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1139 |
/* "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
|
1140 |
* 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
|
1141 |
* divided by 8192." */ |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1142 |
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
|
1143 |
} |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1144 |
} |
de9ef7bf3ea5
(svn r9617) -Codechange: Implement callback for cargo profit calculation
peter1138
parents:
6453
diff
changeset
|
1145 |
|
7328
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1146 |
/* zero the distance (thus income) if it's the bank and very short transport. */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1147 |
if (_settings_game.game_creation.landscape == LT_TEMPERATE && cs->label == 'VALU' && dist < 10) return 0; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1148 |
|
0 | 1149 |
|
7328
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1150 |
static const int MIN_TIME_FACTOR = 31; |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1151 |
static const int MAX_TIME_FACTOR = 255; |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1152 |
|
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1153 |
const int days1 = cs->transit_days[0]; |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1154 |
const int days2 = cs->transit_days[1]; |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1155 |
const int days_over_days1 = transit_days - days1; |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1156 |
|
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1157 |
/* |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1158 |
* The time factor is calculated based on the time it took |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1159 |
* (transit_days) compared two cargo-depending values. The |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1160 |
* range is divided into three parts: |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1161 |
* |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1162 |
* - constant for fast transits |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1163 |
* - linear decreasing with time with a slope of -1 for medium transports |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1164 |
* - linear decreasing with time with a slope of -2 for slow transports |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1165 |
* |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1166 |
*/ |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1167 |
int time_factor; |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1168 |
if (days_over_days1 <= 0) { |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1169 |
time_factor = MAX_TIME_FACTOR; |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1170 |
} else if (days_over_days1 <= days2) { |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1171 |
time_factor = MAX_TIME_FACTOR - days_over_days1; |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1172 |
} else { |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1173 |
time_factor = MAX_TIME_FACTOR - 2 * days_over_days1 + days2; |
0 | 1174 |
} |
1175 |
||
7328
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1176 |
if (time_factor < MIN_TIME_FACTOR) time_factor = MIN_TIME_FACTOR; |
c97074186530
(svn r10691) -Codechange [FS#509]: simplify GetTransportedGoodsIncome to make it more obvious and less hidden what actually happens. Based on a patch by rfalke.
rubidium
parents:
7287
diff
changeset
|
1177 |
|
7926
01d19beae592
(svn r11479) -Codechange: Move the BIGMUL functions to the file of their usage
skidd13
parents:
7922
diff
changeset
|
1178 |
return BigMulS(dist * time_factor * num_pieces, _cargo_payment_rates[cargo_type], 21); |
0 | 1179 |
} |
1180 |
||
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
|
1181 |
static void DeliverGoodsToIndustry(TileIndex xy, CargoID cargo_type, int num_pieces) |
0 | 1182 |
{ |
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
|
1183 |
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
|
1184 |
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
|
1185 |
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
|
1186 |
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
|
1187 |
uint accepted_cargo_index = 0; ///< unlikely value, just for warning removing |
0 | 1188 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1189 |
/* 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
|
1190 |
* 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
|
1191 |
* 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
|
1192 |
* 2) Distribute between industries if more then one is present */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1193 |
best_dist = (_settings_game.station.station_spread + 8) * 2; |
830
36c1366367e4
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
truelight
parents:
820
diff
changeset
|
1194 |
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
|
1195 |
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
|
1196 |
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
|
1197 |
|
7645
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7642
diff
changeset
|
1198 |
for (i = 0; i < lengthof(ind->accepts_cargo); i++) { |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7642
diff
changeset
|
1199 |
if (cargo_type == ind->accepts_cargo[i]) break; |
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
|
1200 |
} |
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
|
1201 |
|
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
|
1202 |
/* Check if matching cargo has been found */ |
7645
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7642
diff
changeset
|
1203 |
if (i == lengthof(ind->accepts_cargo)) continue; |
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 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7926
diff
changeset
|
1205 |
if (HasBit(indspec->callback_flags, CBM_IND_REFUSE_CARGO)) { |
7199
e65a28455ee3
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7195
diff
changeset
|
1206 |
uint16 res = GetIndustryCallback(CBID_INDUSTRY_REFUSE_CARGO, 0, GetReverseCargoTranslation(cargo_type, indspec->grf_prop.grffile), ind, ind->type, ind->xy); |
e65a28455ee3
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7195
diff
changeset
|
1207 |
if (res == 0) continue; |
e65a28455ee3
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7195
diff
changeset
|
1208 |
} |
e65a28455ee3
(svn r10477) -Codechange: add some callbacks to customise the acceptance of industries.
rubidium
parents:
7195
diff
changeset
|
1209 |
|
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
|
1210 |
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
|
1211 |
|
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
|
1212 |
if (dist < best_dist) { |
0 | 1213 |
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
|
1214 |
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
|
1215 |
accepted_cargo_index = i; |
0 | 1216 |
} |
1217 |
} |
|
1218 |
||
1219 |
/* Found one? */ |
|
1220 |
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
|
1221 |
indspec = GetIndustrySpec(best->type); |
7165
fb78336b205f
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7124
diff
changeset
|
1222 |
uint16 callback = indspec->callback_flags; |
7186
818eba1f20d5
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7168
diff
changeset
|
1223 |
|
0 | 1224 |
best->was_cargo_delivered = true; |
7186
818eba1f20d5
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7168
diff
changeset
|
1225 |
best->last_cargo_accepted_at = _date; |
7165
fb78336b205f
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7124
diff
changeset
|
1226 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7926
diff
changeset
|
1227 |
if (HasBit(callback, CBM_IND_PRODUCTION_CARGO_ARRIVAL) || HasBit(callback, CBM_IND_PRODUCTION_256_TICKS)) { |
7165
fb78336b205f
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7124
diff
changeset
|
1228 |
best->incoming_cargo_waiting[accepted_cargo_index] = min(num_pieces + best->incoming_cargo_waiting[accepted_cargo_index], 0xFFFF); |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7926
diff
changeset
|
1229 |
if (HasBit(callback, CBM_IND_PRODUCTION_CARGO_ARRIVAL)) { |
7195
8c728b5fef43
(svn r10473) -Codechange: make the industry "window", the one that shows when you click on an industry, more flexible to allow easier integration with newindustries.
rubidium
parents:
7186
diff
changeset
|
1230 |
IndustryProductionCallback(best, 0); |
8c728b5fef43
(svn r10473) -Codechange: make the industry "window", the one that shows when you click on an industry, more flexible to allow easier integration with newindustries.
rubidium
parents:
7186
diff
changeset
|
1231 |
} else { |
8c728b5fef43
(svn r10473) -Codechange: make the industry "window", the one that shows when you click on an industry, more flexible to allow easier integration with newindustries.
rubidium
parents:
7186
diff
changeset
|
1232 |
InvalidateWindow(WC_INDUSTRY_VIEW, best->index); |
8c728b5fef43
(svn r10473) -Codechange: make the industry "window", the one that shows when you click on an industry, more flexible to allow easier integration with newindustries.
rubidium
parents:
7186
diff
changeset
|
1233 |
} |
7165
fb78336b205f
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7124
diff
changeset
|
1234 |
} else { |
fb78336b205f
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7124
diff
changeset
|
1235 |
best->produced_cargo_waiting[0] = min(best->produced_cargo_waiting[0] + (num_pieces * indspec->input_cargo_multiplier[accepted_cargo_index][0] / 256), 0xFFFF); |
fb78336b205f
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7124
diff
changeset
|
1236 |
best->produced_cargo_waiting[1] = min(best->produced_cargo_waiting[1] + (num_pieces * indspec->input_cargo_multiplier[accepted_cargo_index][1] / 256), 0xFFFF); |
fb78336b205f
(svn r10439) -Codechange: initial steps for customized industry productions.
rubidium
parents:
7124
diff
changeset
|
1237 |
} |
7229
a5f262f6df1b
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7199
diff
changeset
|
1238 |
|
7860
5cdd0d914013
(svn r11410) -Codechange: implement random triggers for industries.
rubidium
parents:
7832
diff
changeset
|
1239 |
TriggerIndustry(best, INDUSTRY_TRIGGER_RECEIVED_CARGO); |
7229
a5f262f6df1b
(svn r10508) -Codechange: allow customizable animation schemes for industries.
rubidium
parents:
7199
diff
changeset
|
1240 |
StartStopIndustryTileAnimation(best, IAT_INDUSTRY_RECEIVED_CARGO); |
0 | 1241 |
} |
1242 |
} |
|
1243 |
||
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
|
1244 |
static bool CheckSubsidised(Station *from, Station *to, CargoID cargo_type) |
0 | 1245 |
{ |
1246 |
Subsidy *s; |
|
1247 |
TileIndex xy; |
|
1248 |
Pair pair; |
|
1249 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1250 |
/* check if there is an already existing subsidy that applies to us */ |
2951 | 1251 |
for (s = _subsidies; s != endof(_subsidies); s++) { |
0 | 1252 |
if (s->cargo_type == cargo_type && |
1253 |
s->age >= 12 && |
|
1254 |
s->from == from->index && |
|
2951 | 1255 |
s->to == to->index) { |
0 | 1256 |
return true; |
2951 | 1257 |
} |
0 | 1258 |
} |
1259 |
||
1260 |
/* check if there's a new subsidy that applies.. */ |
|
2951 | 1261 |
for (s = _subsidies; s != endof(_subsidies); s++) { |
0 | 1262 |
if (s->cargo_type == cargo_type && s->age < 12) { |
1263 |
/* 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
|
1264 |
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
|
1265 |
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
|
1266 |
xy = GetTown(s->from)->xy; |
0 | 1267 |
} else { |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
863
diff
changeset
|
1268 |
xy = (GetIndustry(s->from))->xy; |
0 | 1269 |
} |
2951 | 1270 |
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
|
1271 |
|
0 | 1272 |
/* 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
|
1273 |
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
|
1274 |
case TE_PASSENGERS: |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1275 |
case TE_MAIL: |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1276 |
case TE_GOODS: |
6fae8409b635
(svn r9257) -Codechange: Use cargo's town effect property for determining subsidy source/target type.
peter1138
parents:
6262
diff
changeset
|
1277 |
case TE_FOOD: |
2989 | 1278 |
xy = GetTown(s->to)->xy; |
1279 |
break; |
|
1280 |
||
1281 |
default: |
|
1282 |
xy = GetIndustry(s->to)->xy; |
|
1283 |
break; |
|
0 | 1284 |
} |
2951 | 1285 |
if (DistanceMax(xy, to->xy) > 9) continue; |
0 | 1286 |
|
1287 |
/* Found a subsidy, change the values to indicate that it's in use */ |
|
1288 |
s->age = 12; |
|
1289 |
s->from = from->index; |
|
1290 |
s->to = to->index; |
|
1291 |
||
1292 |
/* Add a news item */ |
|
1293 |
pair = SetupSubsidyDecodeParam(s, 0); |
|
7124
8ef9caaddce5
(svn r10397) -Fix [FS#969]: subsidy awarded messages broken due to {COMPANY} now taking 1 (not 2) parameters. also remove an unnecessary dereference.
peter1138
parents:
7067
diff
changeset
|
1294 |
InjectDParam(1); |
0 | 1295 |
|
7124
8ef9caaddce5
(svn r10397) -Fix [FS#969]: subsidy awarded messages broken due to {COMPANY} now taking 1 (not 2) parameters. also remove an unnecessary dereference.
peter1138
parents:
7067
diff
changeset
|
1296 |
SetDParam(0, _current_player); |
0 | 1297 |
AddNewsItem( |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1298 |
STR_2031_SERVICE_SUBSIDY_AWARDED + _settings_game.difficulty.subsidy_multiplier, |
9234
bfc9d27d3d0d
(svn r13100) -Codechange: reduce the amount of parameters passed via AddNewsMessage as there is (for each news message type) a tuple of 4 parameters that is the same for all calls.
rubidium
parents:
9199
diff
changeset
|
1299 |
NS_SUBSIDIES, |
2951 | 1300 |
pair.a, pair.b |
1301 |
); |
|
0 | 1302 |
|
1303 |
InvalidateWindow(WC_SUBSIDIES_LIST, 0); |
|
1304 |
return true; |
|
1305 |
} |
|
1306 |
} |
|
1307 |
return false; |
|
1308 |
} |
|
1309 |
||
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
1310 |
static Money DeliverGoods(int num_pieces, CargoID cargo_type, StationID source, StationID dest, TileIndex source_tile, byte days_in_transit) |
0 | 1311 |
{ |
1312 |
bool subsidised; |
|
1313 |
Station *s_from, *s_to; |
|
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
1314 |
Money profit; |
0 | 1315 |
|
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
3655
diff
changeset
|
1316 |
assert(num_pieces > 0); |
0 | 1317 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1318 |
/* Update player statistics */ |
0 | 1319 |
{ |
1962
8254df1b359b
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1935
diff
changeset
|
1320 |
Player *p = GetPlayer(_current_player); |
0 | 1321 |
p->cur_economy.delivered_cargo += num_pieces; |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1322 |
SetBit(p->cargo_types, cargo_type); |
0 | 1323 |
} |
1324 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1325 |
/* Get station pointers. */ |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
863
diff
changeset
|
1326 |
s_from = GetStation(source); |
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
863
diff
changeset
|
1327 |
s_to = GetStation(dest); |
0 | 1328 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1329 |
/* Check if a subsidy applies. */ |
0 | 1330 |
subsidised = CheckSubsidised(s_from, s_to, cargo_type); |
1331 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1332 |
/* 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
|
1333 |
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
|
1334 |
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
|
1335 |
if (cs->town_effect == TE_WATER) s_to->town->new_act_water += num_pieces; |
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 |
/* Give the goods to the industry. */ |
0 | 1338 |
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
|
1339 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1340 |
/* 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
|
1341 |
profit = GetTransportedGoodsIncome(num_pieces, DistanceManhattan(source_tile, s_to->xy), days_in_transit, cargo_type); |
0 | 1342 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1343 |
/* Modify profit if a subsidy is in effect */ |
0 | 1344 |
if (subsidised) { |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1345 |
switch (_settings_game.difficulty.subsidy_multiplier) { |
3655
f91f341a613e
(svn r4570) - Fix: subsidy calculation was too high, broken in r3564
peter1138
parents:
3613
diff
changeset
|
1346 |
case 0: profit += profit >> 1; break; |
f91f341a613e
(svn r4570) - Fix: subsidy calculation was too high, broken in r3564
peter1138
parents:
3613
diff
changeset
|
1347 |
case 1: profit *= 2; break; |
f91f341a613e
(svn r4570) - Fix: subsidy calculation was too high, broken in r3564
peter1138
parents:
3613
diff
changeset
|
1348 |
case 2: profit *= 3; break; |
f91f341a613e
(svn r4570) - Fix: subsidy calculation was too high, broken in r3564
peter1138
parents:
3613
diff
changeset
|
1349 |
default: profit *= 4; break; |
0 | 1350 |
} |
1351 |
} |
|
1352 |
||
1353 |
return profit; |
|
1354 |
} |
|
1355 |
||
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1356 |
/** |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1357 |
* 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
|
1358 |
* @param front_v the vehicle to be unloaded |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1359 |
*/ |
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1360 |
void VehiclePayment(Vehicle *front_v) |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1361 |
{ |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1362 |
int result = 0; |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1363 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1364 |
Money vehicle_profit = 0; // Money paid to the train |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1365 |
Money route_profit = 0; // The grand total amount for the route. A-D of transfer chain A-B-C-D |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1366 |
Money virtual_profit = 0; // The virtual profit for entire vehicle chain |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1367 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1368 |
StationID last_visited = front_v->last_station_visited; |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1369 |
Station *st = GetStation(last_visited); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1370 |
|
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1371 |
/* 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
|
1372 |
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
|
1373 |
_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
|
1374 |
|
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1375 |
/* At this moment loading cannot be finished */ |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1376 |
ClrBit(front_v->vehicle_flags, VF_LOADING_FINISHED); |
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1377 |
|
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1378 |
/* 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
|
1379 |
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
|
1380 |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7474
diff
changeset
|
1381 |
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
|
1382 |
/* No cargo to unload */ |
8883
baee554a9449
(svn r12650) -Feature: ability to force a vehicle to not load at a station.
rubidium
parents:
8873
diff
changeset
|
1383 |
if (v->cargo_cap == 0 || v->cargo.Empty() || front_v->current_order.GetUnloadType() & OUFB_NO_UNLOAD) continue; |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1384 |
|
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1385 |
/* All cargo has already been paid for, no need to pay again */ |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1386 |
if (!v->cargo.UnpaidCargo()) { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1387 |
SetBit(v->vehicle_flags, VF_CARGO_UNLOADING); |
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
|
1388 |
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
|
1389 |
} |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1390 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1391 |
GoodsEntry *ge = &st->goods[v->cargo_type]; |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1392 |
const CargoList::List *cargos = v->cargo.Packets(); |
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
|
1393 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1394 |
for (CargoList::List::const_iterator it = cargos->begin(); it != cargos->end(); it++) { |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1395 |
CargoPacket *cp = *it; |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1396 |
if (!cp->paid_for && |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1397 |
cp->source != last_visited && |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7926
diff
changeset
|
1398 |
HasBit(ge->acceptance_pickup, GoodsEntry::ACCEPTANCE) && |
8855
6d841d5d4789
(svn r12617) -Codechange: add type safety to the Order's load and unload types.
rubidium
parents:
8843
diff
changeset
|
1399 |
(front_v->current_order.GetUnloadType() & OUFB_TRANSFER) == 0) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1400 |
/* Deliver goods to the station */ |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1401 |
st->time_since_unload = 0; |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1402 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1403 |
/* handle end of route payment */ |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1404 |
Money profit = DeliverGoods(cp->count, v->cargo_type, cp->source, last_visited, cp->source_xy, cp->days_in_transit); |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1405 |
cp->paid_for = true; |
7436
2ef100150423
(svn r10857) -Fix: feeder-income was broken; substract the feeder-costs from the vehicle-income, not from the route-income (tnx to RichK for all the info)
truelight
parents:
7398
diff
changeset
|
1406 |
route_profit += profit; // display amount paid for final route delivery, A-D of a chain A-B-C-D |
2ef100150423
(svn r10857) -Fix: feeder-income was broken; substract the feeder-costs from the vehicle-income, not from the route-income (tnx to RichK for all the info)
truelight
parents:
7398
diff
changeset
|
1407 |
vehicle_profit += profit - cp->feeder_share; // whole vehicle is not payed for transfers picked up earlier |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1408 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1409 |
result |= 1; |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1410 |
|
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1411 |
SetBit(v->vehicle_flags, VF_CARGO_UNLOADING); |
8855
6d841d5d4789
(svn r12617) -Codechange: add type safety to the Order's load and unload types.
rubidium
parents:
8843
diff
changeset
|
1412 |
} else if (front_v->current_order.GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) { |
6d841d5d4789
(svn r12617) -Codechange: add type safety to the Order's load and unload types.
rubidium
parents:
8843
diff
changeset
|
1413 |
if (!cp->paid_for && (front_v->current_order.GetUnloadType() & OUFB_TRANSFER) != 0) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1414 |
Money profit = GetTransportedGoodsIncome( |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1415 |
cp->count, |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1416 |
/* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */ |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1417 |
DistanceManhattan(cp->loaded_at_xy, GetStation(last_visited)->xy), |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1418 |
cp->days_in_transit, |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1419 |
v->cargo_type); |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1420 |
|
8556
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8424
diff
changeset
|
1421 |
front_v->profit_this_year += profit << 8; |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1422 |
virtual_profit += profit; // accumulate transfer profits for whole vehicle |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1423 |
cp->feeder_share += profit; // account for the (virtual) profit already made for the cargo packet |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1424 |
cp->paid_for = true; // record that the cargo has been paid for to eliminate double counting |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1425 |
} |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1426 |
result |= 2; |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1427 |
|
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1428 |
SetBit(v->vehicle_flags, VF_CARGO_UNLOADING); |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1429 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1430 |
} |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1431 |
v->cargo.InvalidateCache(); |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1432 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1433 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1434 |
if (virtual_profit > 0) { |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1435 |
ShowFeederIncomeAnimation(front_v->x_pos, front_v->y_pos, front_v->z_pos, virtual_profit); |
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 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1438 |
if (route_profit != 0) { |
8556
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8424
diff
changeset
|
1439 |
front_v->profit_this_year += vehicle_profit << 8; |
8230
64f28fe2d5c8
(svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114).
rubidium
parents:
8224
diff
changeset
|
1440 |
SubtractMoneyFromPlayer(CommandCost(front_v->GetExpenseType(true), -route_profit)); |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1441 |
|
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1442 |
if (IsLocalPlayer() && !PlayVehicleSound(front_v, VSE_LOAD_UNLOAD)) { |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1443 |
SndPlayVehicleFx(SND_14_CASHTILL, front_v); |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1444 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1445 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1446 |
ShowCostOrIncomeAnimation(front_v->x_pos, front_v->y_pos, front_v->z_pos, -vehicle_profit); |
6559
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 |
|
6565
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1449 |
_current_player = old_player; |
6559
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1450 |
} |
354d355736ab
(svn r9761) -Codechange: refactor cargo payment out of LoadUnloadVehicle.
rubidium
parents:
6500
diff
changeset
|
1451 |
|
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
|
1452 |
/** |
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
|
1453 |
* 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
|
1454 |
* @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
|
1455 |
* @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
|
1456 |
* 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
|
1457 |
* 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
|
1458 |
* 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
|
1459 |
*/ |
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
|
1460 |
static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) |
0 | 1461 |
{ |
8837
72125f871eb4
(svn r12585) -Fix (r12584): assumption that assertions were enabled during compilation/testing was flawed.
rubidium
parents:
8814
diff
changeset
|
1462 |
assert(v->current_order.IsType(OT_LOADING)); |
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
|
1463 |
|
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
|
1464 |
/* 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
|
1465 |
if (--v->load_unload_time_rem != 0) { |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1466 |
if (_settings_game.order.improved_load && (v->current_order.GetLoadType() & OLFB_FULL_LOAD)) { |
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
|
1467 |
/* 'Reserve' this cargo for this vehicle, because we were first. */ |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7474
diff
changeset
|
1468 |
for (; v != NULL; v = v->Next()) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1469 |
if (v->cargo_cap != 0) cargo_left[v->cargo_type] -= v->cargo_cap - v->cargo.Count(); |
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
|
1470 |
} |
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
|
1471 |
} |
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
|
1472 |
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
|
1473 |
} |
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
|
1474 |
|
8231
d98af7a3fecb
(svn r11794) -Fix [FS#1632]: reversing a train when loading at a station with an adjacent station in the same axis crashed.
glx
parents:
8230
diff
changeset
|
1475 |
StationID last_visited = v->last_station_visited; |
d98af7a3fecb
(svn r11794) -Fix [FS#1632]: reversing a train when loading at a station with an adjacent station in the same axis crashed.
glx
parents:
8230
diff
changeset
|
1476 |
Station *st = GetStation(last_visited); |
d98af7a3fecb
(svn r11794) -Fix [FS#1632]: reversing a train when loading at a station with an adjacent station in the same axis crashed.
glx
parents:
8230
diff
changeset
|
1477 |
|
d98af7a3fecb
(svn r11794) -Fix [FS#1632]: reversing a train when loading at a station with an adjacent station in the same axis crashed.
glx
parents:
8230
diff
changeset
|
1478 |
if (v->type == VEH_TRAIN && (!IsTileType(v->tile, MP_STATION) || GetStationIndex(v->tile) != st->index)) { |
6844
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1479 |
/* 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
|
1480 |
* out and let the train just leave as it always did. */ |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1481 |
SetBit(v->vehicle_flags, VF_LOADING_FINISHED); |
6844
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1482 |
return; |
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1483 |
} |
ee73775d49d2
(svn r10084) -Fix [FS#855]: reversing a train when loading at a station crashed.
rubidium
parents:
6823
diff
changeset
|
1484 |
|
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1485 |
int unloading_time = 0; |
0 | 1486 |
Vehicle *u = v; |
1487 |
int result = 0; |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1488 |
uint 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
|
1489 |
|
8241
b5c1a0a74838
(svn r11805) -Fix [FS#1620]: VEHICLE_TRIGGER_EMPTY was triggered continuously while train waiting in station.
frosch
parents:
8238
diff
changeset
|
1490 |
bool completely_emptied = true; |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1491 |
bool anything_unloaded = false; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1492 |
bool anything_loaded = false; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1493 |
uint32 cargo_not_full = 0; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1494 |
uint32 cargo_full = 0; |
0 | 1495 |
|
1496 |
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
|
1497 |
|
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7474
diff
changeset
|
1498 |
for (; v != NULL; v = v->Next()) { |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1499 |
if (v->cargo_cap == 0) continue; |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1500 |
|
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1501 |
byte load_amount = EngInfo(v->engine_type)->load_amount; |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1502 |
if (_settings_game.order.gradual_loading && HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_LOAD_AMOUNT)) { |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
1503 |
uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v); |
9020
8174bbda9abe
(svn r12819) -Codechange: handle more NewGRFs in the same way as TTDP does it, i.e. testing the low bits for 0xFF or 0 instead of all bits.
rubidium
parents:
9003
diff
changeset
|
1504 |
if (cb_load_amount != CALLBACK_FAILED && GB(cb_load_amount, 0, 8) != 0) load_amount = GB(cb_load_amount, 0, 8); |
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
1505 |
} |
2639 | 1506 |
|
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1507 |
GoodsEntry *ge = &st->goods[v->cargo_type]; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1508 |
|
8883
baee554a9449
(svn r12650) -Feature: ability to force a vehicle to not load at a station.
rubidium
parents:
8873
diff
changeset
|
1509 |
if (HasBit(v->vehicle_flags, VF_CARGO_UNLOADING) && (u->current_order.GetUnloadType() & OUFB_NO_UNLOAD) == 0) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1510 |
uint cargo_count = v->cargo.Count(); |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1511 |
uint amount_unloaded = _settings_game.order.gradual_loading ? min(cargo_count, load_amount) : cargo_count; |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1512 |
bool remaining; // Are there cargo entities in this vehicle that can still be unloaded here? |
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 |
|
8855
6d841d5d4789
(svn r12617) -Codechange: add type safety to the Order's load and unload types.
rubidium
parents:
8843
diff
changeset
|
1514 |
if (HasBit(ge->acceptance_pickup, GoodsEntry::ACCEPTANCE) && !(u->current_order.GetUnloadType() & OUFB_TRANSFER)) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1515 |
/* The cargo has reached it's final destination, the packets may now be destroyed */ |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1516 |
remaining = v->cargo.MoveTo(NULL, amount_unloaded, CargoList::MTA_FINAL_DELIVERY, last_visited); |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1517 |
|
0 | 1518 |
result |= 1; |
8855
6d841d5d4789
(svn r12617) -Codechange: add type safety to the Order's load and unload types.
rubidium
parents:
8843
diff
changeset
|
1519 |
} else if (u->current_order.GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1520 |
remaining = v->cargo.MoveTo(&ge->cargo, amount_unloaded); |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1521 |
SetBit(ge->acceptance_pickup, GoodsEntry::PICKUP); |
6198 | 1522 |
|
0 | 1523 |
result |= 2; |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1524 |
} else { |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1525 |
/* 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
|
1526 |
* station does not accept goods anymore. */ |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1527 |
ClrBit(v->vehicle_flags, VF_CARGO_UNLOADING); |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1528 |
continue; |
0 | 1529 |
} |
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
|
1530 |
|
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1531 |
/* Deliver goods to the station */ |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1532 |
st->time_since_unload = 0; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1533 |
|
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1534 |
unloading_time += amount_unloaded; |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1535 |
|
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1536 |
anything_unloaded = true; |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1537 |
if (_settings_game.order.gradual_loading && remaining) { |
8241
b5c1a0a74838
(svn r11805) -Fix [FS#1620]: VEHICLE_TRIGGER_EMPTY was triggered continuously while train waiting in station.
frosch
parents:
8238
diff
changeset
|
1538 |
completely_emptied = false; |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1539 |
} else { |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1540 |
/* We have finished unloading (cargo count == 0) */ |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1541 |
ClrBit(v->vehicle_flags, VF_CARGO_UNLOADING); |
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1542 |
} |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1543 |
|
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1544 |
continue; |
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1545 |
} |
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
|
1546 |
|
8885
647cda0e9312
(svn r12652) -Codechange: rework the order GUI a little more to make it a little more clear that 'transfer' is just an unload type.
rubidium
parents:
8883
diff
changeset
|
1547 |
/* Do not pick up goods when we have no-load set. */ |
647cda0e9312
(svn r12652) -Codechange: rework the order GUI a little more to make it a little more clear that 'transfer' is just an unload type.
rubidium
parents:
8883
diff
changeset
|
1548 |
if (u->current_order.GetLoadType() & OLFB_NO_LOAD) continue; |
0 | 1549 |
|
1550 |
/* update stats */ |
|
6609
5db3cdab0591
(svn r9829) -Codechange: more refactoring of the unloading algorithm.
rubidium
parents:
6601
diff
changeset
|
1551 |
int t; |
2989 | 1552 |
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
|
1553 |
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
|
1554 |
case VEH_ROAD: t = u->max_speed / 2; break; |
2989 | 1555 |
default: t = u->max_speed; break; |
1556 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1557 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1558 |
/* if last speed is 0, we treat that as if no vehicle has ever visited the station. */ |
2989 | 1559 |
ge->last_speed = min(t, 255); |
6990
136a08baf0ed
(svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch.
rubidium
parents:
6957
diff
changeset
|
1560 |
ge->last_age = _cur_year - u->build_year; |
7458
5ffdb894e08c
(svn r10953) -Fix [FS#1139, FS#1143]: stations would not get a rating when there were already two stations with a "more than default" rating as no cargo would be moved to the station to be picked up.
rubidium
parents:
7447
diff
changeset
|
1561 |
ge->days_since_pickup = 0; |
0 | 1562 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1563 |
/* 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
|
1564 |
* has capacity for it, load it on the vehicle. */ |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1565 |
if (!ge->cargo.Empty() && |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1566 |
(cap = v->cargo_cap - v->cargo.Count()) != 0) { |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1567 |
uint count = ge->cargo.Count(); |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1905
diff
changeset
|
1568 |
|
523
8871819c9afd
(svn r853) -Feature: Implement improved vehicle loading algorithm
tron
parents:
507
diff
changeset
|
1569 |
/* 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
|
1570 |
* the same cargo type at this station */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1571 |
if (_settings_game.order.improved_load && cargo_left[v->cargo_type] <= 0) { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1572 |
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
|
1573 |
continue; |
96ef0ede4b83
(svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station.
rubidium
parents:
6559
diff
changeset
|
1574 |
} |
523
8871819c9afd
(svn r853) -Feature: Implement improved vehicle loading algorithm
tron
parents:
507
diff
changeset
|
1575 |
|
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
|
1576 |
if (cap > count) cap = count; |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1577 |
if (_settings_game.order.gradual_loading) cap = min(cap, load_amount); |
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1578 |
if (_settings_game.order.improved_load) { |
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
|
1579 |
/* Don't load stuff that is already 'reserved' for other vehicles */ |
7023
7ecc645ba712
(svn r10287) -Fix (r10266): some surprises from that (almost always) complaining compiler...
rubidium
parents:
7014
diff
changeset
|
1580 |
cap = min((uint)cargo_left[v->cargo_type], cap); |
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
|
1581 |
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
|
1582 |
} |
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
|
1583 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1584 |
if (v->cargo.Empty()) TriggerVehicle(v, VEHICLE_TRIGGER_NEW_CARGO); |
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
|
1585 |
|
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
|
1586 |
/* 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
|
1587 |
* 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
|
1588 |
* 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
|
1589 |
* 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
|
1590 |
* the whole vehicle chain is really totally empty, the |
8241
b5c1a0a74838
(svn r11805) -Fix [FS#1620]: VEHICLE_TRIGGER_EMPTY was triggered continuously while train waiting in station.
frosch
parents:
8238
diff
changeset
|
1591 |
* completely_emptied 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
|
1592 |
* removed; that's how TTDPatch behaves too. --pasky */ |
8241
b5c1a0a74838
(svn r11805) -Fix [FS#1620]: VEHICLE_TRIGGER_EMPTY was triggered continuously while train waiting in station.
frosch
parents:
8238
diff
changeset
|
1593 |
completely_emptied = 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
|
1594 |
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
|
1595 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1596 |
ge->cargo.MoveTo(&v->cargo, cap, CargoList::MTA_CARGO_LOAD, st->xy); |
6198 | 1597 |
|
0 | 1598 |
st->time_since_load = 0; |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1599 |
st->last_vehicle_type = v->type; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
147
diff
changeset
|
1600 |
|
9003
7972fa66d9c9
(svn r12798) -Feature: Add some support for NewGRF station animation. (Thanks to mart3p for samples and fixes)
peter1138
parents:
8885
diff
changeset
|
1601 |
StationAnimationTrigger(st, st->xy, STAT_ANIM_CARGO_TAKEN, v->cargo_type); |
7972fa66d9c9
(svn r12798) -Feature: Add some support for NewGRF station animation. (Thanks to mart3p for samples and fixes)
peter1138
parents:
8885
diff
changeset
|
1602 |
|
7474
1daa825ba893
(svn r10981) -Fix [FS#1156] (r10970): stations gave ratings for accepted cargo too.
rubidium
parents:
7458
diff
changeset
|
1603 |
unloading_time += cap; |
1daa825ba893
(svn r10981) -Fix [FS#1156] (r10970): stations gave ratings for accepted cargo too.
rubidium
parents:
7458
diff
changeset
|
1604 |
|
0 | 1605 |
result |= 2; |
1606 |
} |
|
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1607 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1608 |
if (v->cargo.Count() == v->cargo_cap) { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1609 |
SetBit(cargo_full, v->cargo_type); |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1610 |
} else { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1611 |
SetBit(cargo_not_full, v->cargo_type); |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1612 |
} |
0 | 1613 |
} |
1614 |
||
8241
b5c1a0a74838
(svn r11805) -Fix [FS#1620]: VEHICLE_TRIGGER_EMPTY was triggered continuously while train waiting in station.
frosch
parents:
8238
diff
changeset
|
1615 |
/* Only set completly_emptied, if we just unloaded all remaining cargo */ |
b5c1a0a74838
(svn r11805) -Fix [FS#1620]: VEHICLE_TRIGGER_EMPTY was triggered continuously while train waiting in station.
frosch
parents:
8238
diff
changeset
|
1616 |
completely_emptied &= anything_unloaded; |
b5c1a0a74838
(svn r11805) -Fix [FS#1620]: VEHICLE_TRIGGER_EMPTY was triggered continuously while train waiting in station.
frosch
parents:
8238
diff
changeset
|
1617 |
|
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
|
1618 |
/* 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
|
1619 |
* 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
|
1620 |
* 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
|
1621 |
* enough to fill the previous wagons) */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1622 |
if (_settings_game.order.improved_load && (u->current_order.GetLoadType() & OLFB_FULL_LOAD)) { |
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
|
1623 |
/* Update left cargo */ |
7492
35acee076719
(svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that.
rubidium
parents:
7474
diff
changeset
|
1624 |
for (v = u; v != NULL; v = v->Next()) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1625 |
if (v->cargo_cap != 0) cargo_left[v->cargo_type] -= v->cargo_cap - v->cargo.Count(); |
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
|
1626 |
} |
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
|
1627 |
} |
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
|
1628 |
|
5211
fb4dc0ca975d
(svn r7326) -Feature: Add support for gradual (un)loading of vehicles (Maedhros)
peter1138
parents:
5077
diff
changeset
|
1629 |
v = u; |
1935
164d58b9137c
(svn r2441) -Feature: You can now give transfer order to set up feeder systems
celestar
parents:
1905
diff
changeset
|
1630 |
|
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1631 |
if (anything_loaded || anything_unloaded) { |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1632 |
if (_settings_game.order.gradual_loading) { |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1633 |
/* 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
|
1634 |
* 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
|
1635 |
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
|
1636 |
|
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1637 |
unloading_time = gradual_loading_wait_time[v->type]; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1638 |
} |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1639 |
} else { |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1640 |
bool finished_loading = true; |
8855
6d841d5d4789
(svn r12617) -Codechange: add type safety to the Order's load and unload types.
rubidium
parents:
8843
diff
changeset
|
1641 |
if (v->current_order.GetLoadType() & OLFB_FULL_LOAD) { |
8873
d66baf98e3eb
(svn r12640) -Codechange: let GetLoadType make a difference between full load and full load any based on the patch setting instead of using the patch setting directly.
rubidium
parents:
8855
diff
changeset
|
1642 |
if (v->current_order.GetLoadType() == OLF_FULL_LOAD_ANY) { |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1643 |
/* 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
|
1644 |
* continue loading, no matter how much mail is in */ |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1645 |
if ((v->type == VEH_AIRCRAFT && IsCargoInClass(v->cargo_type, CC_PASSENGERS) && v->cargo_cap != v->cargo.Count()) || |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1646 |
(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
|
1647 |
finished_loading = false; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1648 |
} |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1649 |
} else if (cargo_not_full != 0) { |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1650 |
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
|
1651 |
} |
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
|
1652 |
} |
6611
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1653 |
unloading_time = 20; |
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1654 |
|
9ebe17f772ba
(svn r9831) -Codechange: more refactoring of the loading/unloading.
rubidium
parents:
6609
diff
changeset
|
1655 |
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
|
1656 |
} |
0 | 1657 |
|
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
|
1658 |
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
|
1659 |
/* 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
|
1660 |
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
|
1661 |
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
|
1662 |
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
|
1663 |
unloading_time += (overhang * unloading_time) / 8; |
0 | 1664 |
} |
1665 |
} |
|
1666 |
||
7543
e55bda077bea
(svn r11063) -Codechange: make it possible for people to view the loading indicators of everyone. Patch by SmatZ.
rubidium
parents:
7520
diff
changeset
|
1667 |
/* Calculate the loading indicator fill percent and display |
e55bda077bea
(svn r11063) -Codechange: make it possible for people to view the loading indicators of everyone. Patch by SmatZ.
rubidium
parents:
7520
diff
changeset
|
1668 |
* In the Game Menu do not display indicators |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1669 |
* If _settings_client.gui.loading_indicators == 2, show indicators (bool can be promoted to int as 0 or 1 - results in 2 > 0,1 ) |
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1670 |
* if _settings_client.gui.loading_indicators == 1, _local_player must be the owner or must be a spectator to show ind., so 1 > 0 |
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1671 |
* if _settings_client.gui.loading_indicators == 0, do not display indicators ... 0 is never greater than anything |
7543
e55bda077bea
(svn r11063) -Codechange: make it possible for people to view the loading indicators of everyone. Patch by SmatZ.
rubidium
parents:
7520
diff
changeset
|
1672 |
*/ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1673 |
if (_game_mode != GM_MENU && (_settings_client.gui.loading_indicators > (uint)(v->owner != _local_player && _local_player != PLAYER_SPECTATOR))) { |
7014
533521754123
(svn r10270) -Add: prefixed the loading indicator with an arrow, up meaning vehicle is loading, down meaning vehicle is unloading
truelight
parents:
7010
diff
changeset
|
1674 |
StringID percent_up_down = STR_NULL; |
533521754123
(svn r10270) -Add: prefixed the loading indicator with an arrow, up meaning vehicle is loading, down meaning vehicle is unloading
truelight
parents:
7010
diff
changeset
|
1675 |
int percent = CalcPercentVehicleFilled(v, &percent_up_down); |
6998
39e783d3816c
(svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh)
truelight
parents:
6991
diff
changeset
|
1676 |
if (v->fill_percent_te_id == INVALID_TE_ID) { |
7014
533521754123
(svn r10270) -Add: prefixed the loading indicator with an arrow, up meaning vehicle is loading, down meaning vehicle is unloading
truelight
parents:
7010
diff
changeset
|
1677 |
v->fill_percent_te_id = ShowFillingPercent(v->x_pos, v->y_pos, v->z_pos + 20, percent, percent_up_down); |
6998
39e783d3816c
(svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh)
truelight
parents:
6991
diff
changeset
|
1678 |
} else { |
7014
533521754123
(svn r10270) -Add: prefixed the loading indicator with an arrow, up meaning vehicle is loading, down meaning vehicle is unloading
truelight
parents:
7010
diff
changeset
|
1679 |
UpdateFillingPercent(v->fill_percent_te_id, percent, percent_up_down); |
6998
39e783d3816c
(svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh)
truelight
parents:
6991
diff
changeset
|
1680 |
} |
39e783d3816c
(svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh)
truelight
parents:
6991
diff
changeset
|
1681 |
} |
39e783d3816c
(svn r10254) -Feature: loading indicator, which shows in % how full a vehicle is while loading/unloading (TheJosh)
truelight
parents:
6991
diff
changeset
|
1682 |
|
0 | 1683 |
v->load_unload_time_rem = unloading_time; |
1684 |
||
8241
b5c1a0a74838
(svn r11805) -Fix [FS#1620]: VEHICLE_TRIGGER_EMPTY was triggered continuously while train waiting in station.
frosch
parents:
8238
diff
changeset
|
1685 |
if (completely_emptied) { |
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
|
1686 |
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
|
1687 |
} |
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
|
1688 |
|
0 | 1689 |
if (result != 0) { |
9043
eb4f06b99146
(svn r12862) -Codechange: reduce code duplication for VehicleType -> WindowClass lookup
smatz
parents:
9020
diff
changeset
|
1690 |
InvalidateWindow(GetWindowClassForVehicleType(v->type), v->owner); |
0 | 1691 |
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
|
1692 |
|
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
|
1693 |
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
|
1694 |
v->MarkDirty(); |
0 | 1695 |
|
2951 | 1696 |
if (result & 2) InvalidateWindow(WC_STATION_VIEW, last_visited); |
0 | 1697 |
} |
1698 |
} |
|
1699 |
||
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
|
1700 |
/** |
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
|
1701 |
* 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
|
1702 |
* 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
|
1703 |
* @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
|
1704 |
*/ |
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
|
1705 |
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
|
1706 |
{ |
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
|
1707 |
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
|
1708 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
7002
diff
changeset
|
1709 |
for (uint i = 0; i < NUM_CARGO; i++) cargo_left[i] = st->goods[i].cargo.Count(); |
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
|
1710 |
|
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
|
1711 |
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
|
1712 |
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
|
1713 |
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
|
1714 |
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
|
1715 |
} |
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
|
1716 |
} |
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
|
1717 |
|
6247 | 1718 |
void PlayersMonthlyLoop() |
0 | 1719 |
{ |
1720 |
PlayersGenStatistics(); |
|
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1721 |
if (_settings_game.economy.inflation && _cur_year < MAX_YEAR) |
0 | 1722 |
AddInflation(); |
1723 |
PlayersPayInterest(); |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1724 |
/* Reset the _current_player flag */ |
206 | 1725 |
_current_player = OWNER_NONE; |
0 | 1726 |
HandleEconomyFluctuations(); |
1727 |
SubsidyMonthlyHandler(); |
|
1728 |
} |
|
1729 |
||
1730 |
static void DoAcquireCompany(Player *p) |
|
1731 |
{ |
|
1732 |
Player *owner; |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1733 |
int i; |
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
1734 |
Money value; |
0 | 1735 |
|
9199
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
1736 |
SetDParam(0, STR_7059_TRANSPORT_COMPANY_MERGER); |
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
1737 |
SetDParam(1, p->bankrupt_value == 0 ? STR_707F_HAS_BEEN_TAKEN_OVER_BY : STR_705A_HAS_BEEN_SOLD_TO_FOR); |
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
1738 |
SetDParam(2, p->index); |
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
1739 |
SetDParam(3, _current_player); |
ce9fbdff6581
(svn r13065) -Codechange: remove the need for the news string callbacks. Patch by Cirdan.
rubidium
parents:
9158
diff
changeset
|
1740 |
SetDParam(4, p->bankrupt_value); |
9257
8933adfe564f
(svn r13123) -Codechange: passing the bankrupt type via data_b is not needed anymore. Patch by Cirdan.
rubidium
parents:
9236
diff
changeset
|
1741 |
AddNewsItem(STR_02B6, NS_COMPANY_MERGER, 0, _current_player); |
0 | 1742 |
|
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1743 |
/* 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
|
1744 |
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
|
1745 |
ChangeNetworkOwner(pi, _current_player); |
0 | 1746 |
ChangeOwnershipOfPlayerItems(pi, _current_player); |
1747 |
||
1748 |
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
|
1749 |
owner = GetPlayer(_current_player); |
0 | 1750 |
owner->current_loan += p->current_loan; |
1751 |
} |
|
1752 |
||
1753 |
value = CalculateCompanyValue(p) >> 2; |
|
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
1754 |
PlayerID old_player = _current_player; |
2952 | 1755 |
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
|
1756 |
if (p->share_owners[i] != PLAYER_SPECTATOR) { |
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
1757 |
_current_player = p->share_owners[i]; |
8230
64f28fe2d5c8
(svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114).
rubidium
parents:
8224
diff
changeset
|
1758 |
SubtractMoneyFromPlayer(CommandCost(EXPENSES_OTHER, -value)); |
0 | 1759 |
} |
1760 |
} |
|
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
1761 |
_current_player = old_player; |
0 | 1762 |
|
1763 |
p->is_active = false; |
|
1764 |
||
1765 |
DeletePlayerWindows(pi); |
|
9297
1cb8d7bbdc8a
(svn r13165) -Codechange: replace some RebuildXXXList/ResortXXXList+InvalidateWindowXXX with InvalidateWindowXXXData.
rubidium
parents:
9281
diff
changeset
|
1766 |
InvalidateWindowClassesData(WC_TRAINS_LIST, 0); |
1cb8d7bbdc8a
(svn r13165) -Codechange: replace some RebuildXXXList/ResortXXXList+InvalidateWindowXXX with InvalidateWindowXXXData.
rubidium
parents:
9281
diff
changeset
|
1767 |
InvalidateWindowClassesData(WC_SHIPS_LIST, 0); |
1cb8d7bbdc8a
(svn r13165) -Codechange: replace some RebuildXXXList/ResortXXXList+InvalidateWindowXXX with InvalidateWindowXXXData.
rubidium
parents:
9281
diff
changeset
|
1768 |
InvalidateWindowClassesData(WC_ROADVEH_LIST, 0); |
1cb8d7bbdc8a
(svn r13165) -Codechange: replace some RebuildXXXList/ResortXXXList+InvalidateWindowXXX with InvalidateWindowXXXData.
rubidium
parents:
9281
diff
changeset
|
1769 |
InvalidateWindowClassesData(WC_AIRCRAFT_LIST, 0); |
0 | 1770 |
} |
1771 |
||
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1772 |
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
|
1773 |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1774 |
/** 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
|
1775 |
* @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
|
1776 |
* @param flags type of operation |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1777 |
* @param p1 player to buy the shares from |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1778 |
* @param p2 unused |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1779 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
1780 |
CommandCost CmdBuyShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1781 |
{ |
1782 |
Player *p; |
|
8230
64f28fe2d5c8
(svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114).
rubidium
parents:
8224
diff
changeset
|
1783 |
CommandCost cost(EXPENSES_OTHER); |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1784 |
|
7503
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1785 |
/* Check if buying shares is allowed (protection against modified clients) */ |
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1786 |
/* Cannot buy own shares */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1787 |
if (!IsValidPlayer((PlayerID)p1) || !_settings_game.economy.allow_shares || _current_player == (PlayerID)p1) return CMD_ERROR; |
7503
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1788 |
|
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1789 |
p = GetPlayer((PlayerID)p1); |
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1790 |
|
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1791 |
/* Cannot buy shares of non-existent nor bankrupted company */ |
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1792 |
if (!p->is_active) return CMD_ERROR; |
0 | 1793 |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1794 |
/* Protect new companies from hostile takeovers */ |
8424
c3477565c975
(svn r11994) -Codechange: Remove numbers from string names where the strings aren't present in TTD, since they don't correspond to either TTD's TextIDs or OpenTTD's StringIDs.
maedhros
parents:
8347
diff
changeset
|
1795 |
if (_cur_year - p->inaugurated_year < 6) return_cmd_error(STR_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
|
1796 |
|
599
30da691a5561
(svn r1023) -Fix: [Network] [ 1083692 ] You can no longer buy out a company in MP
truelight
parents:
555
diff
changeset
|
1797 |
/* Those lines are here for network-protection (clients can be slow) */ |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1798 |
if (GetAmountOwnedBy(p, PLAYER_SPECTATOR) == 0) return cost; |
930
ab42e283749d
(svn r1418) -Feature: [1098254] (dis)Allow Shares. Add patch options to allow buying/selling of shares (Hackykid)
darkvater
parents:
919
diff
changeset
|
1799 |
|
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1800 |
/* We can not buy out a real player (temporarily). TODO: well, enable it obviously */ |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1801 |
if (GetAmountOwnedBy(p, PLAYER_SPECTATOR) == 1 && !p->is_ai) return cost; |
1019
6bae6c11e865
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
997
diff
changeset
|
1802 |
|
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1803 |
cost.AddCost(CalculateCompanyValue(p) >> 2); |
0 | 1804 |
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
|
1805 |
PlayerByte* b = p->share_owners; |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1806 |
int i; |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1807 |
|
4848
45f848b46222
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4845
diff
changeset
|
1808 |
while (*b != PLAYER_SPECTATOR) b++; /* share owners is guaranteed to contain at least one PLAYER_SPECTATOR */ |
0 | 1809 |
*b = _current_player; |
1810 |
||
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1811 |
for (i = 0; p->share_owners[i] == _current_player;) { |
0 | 1812 |
if (++i == 4) { |
1813 |
p->bankrupt_value = 0; |
|
1814 |
DoAcquireCompany(p); |
|
1815 |
break; |
|
1816 |
} |
|
1817 |
} |
|
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
|
1818 |
InvalidateWindow(WC_COMPANY, p1); |
0 | 1819 |
} |
1820 |
return cost; |
|
1821 |
} |
|
1822 |
||
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1823 |
/** 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
|
1824 |
* @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
|
1825 |
* @param flags type of operation |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1826 |
* @param p1 player to sell the shares from |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1827 |
* @param p2 unused |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1828 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
1829 |
CommandCost CmdSellShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1830 |
{ |
1831 |
Player *p; |
|
6953
230d1e3ac86c
(svn r10208) -Codechange: replace int32 with Money where appropriate.
rubidium
parents:
6952
diff
changeset
|
1832 |
Money cost; |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1833 |
|
7503
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1834 |
/* Check if selling shares is allowed (protection against modified clients) */ |
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1835 |
/* Cannot sell own shares */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9359
diff
changeset
|
1836 |
if (!IsValidPlayer((PlayerID)p1) || !_settings_game.economy.allow_shares || _current_player == (PlayerID)p1) return CMD_ERROR; |
7503
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1837 |
|
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1838 |
p = GetPlayer((PlayerID)p1); |
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1839 |
|
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1840 |
/* Cannot sell shares of non-existent nor bankrupted company */ |
3f0b9663c72e
(svn r11018) -Fix [FS#1169]: Disallow buying/selling shares in your own company or a bankrupted/non-existant company.
rubidium
parents:
7492
diff
changeset
|
1841 |
if (!p->is_active) return CMD_ERROR; |
0 | 1842 |
|
653
989ae721eb8b
(svn r1086) -Fix: [Network] [ 1084774 ] Fixed quick-share-sell bug
truelight
parents:
630
diff
changeset
|
1843 |
/* Those lines are here for network-protection (clients can be slow) */ |
6950
14ecb0acdfb4
(svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents:
6943
diff
changeset
|
1844 |
if (GetAmountOwnedBy(p, _current_player) == 0) return CommandCost(); |
653
989ae721eb8b
(svn r1086) -Fix: [Network] [ 1084774 ] Fixed quick-share-sell bug
truelight
parents:
630
diff
changeset
|
1845 |
|
0 | 1846 |
/* adjust it a little to make it less profitable to sell and buy */ |
1847 |
cost = CalculateCompanyValue(p) >> 2; |
|
1848 |
cost = -(cost - (cost >> 7)); |
|
1849 |
||
1850 |
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
|
1851 |
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
|
1852 |
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
|
1853 |
*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
|
1854 |
InvalidateWindow(WC_COMPANY, p1); |
0 | 1855 |
} |
8230
64f28fe2d5c8
(svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114).
rubidium
parents:
8224
diff
changeset
|
1856 |
return CommandCost(EXPENSES_OTHER, cost); |
0 | 1857 |
} |
1858 |
||
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1859 |
/** Buy up another company. |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1860 |
* 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
|
1861 |
* that company. |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1862 |
* @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
|
1863 |
* @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
|
1864 |
* @param flags type of operation |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1865 |
* @param p1 player/company to buy up |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1866 |
* @param p2 unused |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1867 |
*/ |
6943
1914f26aee04
(svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents:
6882
diff
changeset
|
1868 |
CommandCost CmdBuyCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
0 | 1869 |
{ |
1870 |
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
|
1871 |
PlayerID pid = (PlayerID)p1; |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1872 |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1873 |
/* 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
|
1874 |
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
|
1875 |
|
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
|
1876 |
/* 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
|
1877 |
if (pid == _current_player) return CMD_ERROR; |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1878 |
|
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
|
1879 |
p = GetPlayer(pid); |
1793
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1880 |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1881 |
if (!p->is_ai) return CMD_ERROR; |
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1882 |
|
b9a37c98b468
(svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents:
1707
diff
changeset
|
1883 |
if (flags & DC_EXEC) { |
0 | 1884 |
DoAcquireCompany(p); |
1885 |
} |
|
8230
64f28fe2d5c8
(svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114).
rubidium
parents:
8224
diff
changeset
|
1886 |
return CommandCost(EXPENSES_OTHER, p->bankrupt_value); |
0 | 1887 |
} |
1888 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1889 |
/** Prices */ |
6247 | 1890 |
static void SaveLoad_PRIC() |
0 | 1891 |
{ |
6955
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1892 |
int vt = CheckSavegameVersion(65) ? (SLE_FILE_I32 | SLE_VAR_I64) : SLE_INT64; |
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1893 |
SlArray(&_price, NUM_PRICES, vt); |
0 | 1894 |
SlArray(&_price_frac, NUM_PRICES, SLE_UINT16); |
1895 |
} |
|
1896 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1897 |
/** Cargo payment rates */ |
6247 | 1898 |
static void SaveLoad_CAPR() |
0 | 1899 |
{ |
6463
e986fe39dfe7
(svn r9638) -Feature: Increase cargo types from 12 to 32 and enable newcargo flag in NewGRF loader.
peter1138
parents:
6458
diff
changeset
|
1900 |
uint num_cargo = CheckSavegameVersion(55) ? 12 : NUM_CARGO; |
6955
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1901 |
int vt = CheckSavegameVersion(65) ? (SLE_FILE_I32 | SLE_VAR_I64) : SLE_INT64; |
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1902 |
SlArray(&_cargo_payment_rates, num_cargo, vt); |
6463
e986fe39dfe7
(svn r9638) -Feature: Increase cargo types from 12 to 32 and enable newcargo flag in NewGRF loader.
peter1138
parents:
6458
diff
changeset
|
1903 |
SlArray(&_cargo_payment_rates_frac, num_cargo, SLE_UINT16); |
0 | 1904 |
} |
1905 |
||
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
|
1906 |
static const SaveLoad _economy_desc[] = { |
6955
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1907 |
SLE_CONDVAR(Economy, max_loan, SLE_FILE_I32 | SLE_VAR_I64, 0, 64), |
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1908 |
SLE_CONDVAR(Economy, max_loan, SLE_INT64, 65, SL_MAX_VERSION), |
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1909 |
SLE_CONDVAR(Economy, max_loan_unround, SLE_FILE_I32 | SLE_VAR_I64, 0, 64), |
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1910 |
SLE_CONDVAR(Economy, max_loan_unround, SLE_INT64, 65, SL_MAX_VERSION), |
7244
8e6293476b5c
(svn r10541) -Fix [FS#1028]: cargo payment rates overflow.
rubidium
parents:
7229
diff
changeset
|
1911 |
SLE_CONDVAR(Economy, max_loan_unround_fract, SLE_UINT16, 70, SL_MAX_VERSION), |
6955
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1912 |
SLE_VAR(Economy, fluct, SLE_FILE_I16 | SLE_VAR_I32), |
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1913 |
SLE_VAR(Economy, interest_rate, SLE_UINT8), |
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1914 |
SLE_VAR(Economy, infl_amount, SLE_UINT8), |
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1915 |
SLE_VAR(Economy, infl_amount_pr, SLE_UINT8), |
da3431cb25a9
(svn r10210) -Codechange: make all money related variables 64 bits, so overflowing them should become a little harder.
rubidium
parents:
6954
diff
changeset
|
1916 |
SLE_END() |
0 | 1917 |
}; |
1918 |
||
6125
a6fff965707c
(svn r8862) -Cleanup: doxygen changes, again. Mostly @files missing tags and a few comments style.
belugas
parents:
6119
diff
changeset
|
1919 |
/** Economy variables */ |
6247 | 1920 |
static void SaveLoad_ECMY() |
0 | 1921 |
{ |
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
|
1922 |
SlObject(&_economy, _economy_desc); |
0 | 1923 |
} |
1924 |
||
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1925 |
extern const ChunkHandler _economy_chunk_handlers[] = { |
0 | 1926 |
{ 'PRIC', SaveLoad_PRIC, SaveLoad_PRIC, CH_RIFF | CH_AUTO_LENGTH}, |
1927 |
{ '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
|
1928 |
{ 'SUBS', Save_SUBS, Load_SUBS, CH_ARRAY}, |
0 | 1929 |
{ 'ECMY', SaveLoad_ECMY, SaveLoad_ECMY, CH_RIFF | CH_LAST}, |
1930 |
}; |