| author | rubidium |
| Tue, 15 Aug 2006 14:52:17 +0000 | |
| changeset 4285 | 72b3f7d6c891 |
| parent 4261 | 2ec8f5a9747b |
| child 4293 | 2c24234a7aec |
| permissions | -rw-r--r-- |
| 2186 | 1 |
/* $Id$ */ |
2 |
||
|
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
3 |
/** @file players.c |
|
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
4 |
* @todo Cleanup the messy DrawPlayerFace function asap |
|
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
5 |
*/ |
| 0 | 6 |
#include "stdafx.h" |
|
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1881
diff
changeset
|
7 |
#include "openttd.h" |
|
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
8 |
#include "engine.h" |
|
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2159
diff
changeset
|
9 |
#include "functions.h" |
|
1317
f382f1b439c7
(svn r1821) Move generic string handling functions to string.[ch] and introduce stre{cpy,cat}, see string.h for their semantics
tron
parents:
1309
diff
changeset
|
10 |
#include "string.h" |
|
1309
dab90d4cbf2d
(svn r1813) Declare functions implemented in strings.c in their own shiny new header (though i think some of these function don't belong into strings.c)
tron
parents:
1304
diff
changeset
|
11 |
#include "strings.h" |
|
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
337
diff
changeset
|
12 |
#include "table/strings.h" |
|
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
13 |
#include "table/sprites.h" |
|
679
e959706a3e4d
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
670
diff
changeset
|
14 |
#include "map.h" |
| 0 | 15 |
#include "player.h" |
16 |
#include "town.h" |
|
17 |
#include "vehicle.h" |
|
18 |
#include "station.h" |
|
19 |
#include "gfx.h" |
|
20 |
#include "news.h" |
|
21 |
#include "saveload.h" |
|
22 |
#include "command.h" |
|
|
337
66647f97e7c0
(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk
tron
parents:
206
diff
changeset
|
23 |
#include "sound.h" |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
24 |
#include "network.h" |
|
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2154
diff
changeset
|
25 |
#include "variables.h" |
| 2848 | 26 |
#include "engine.h" |
|
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
27 |
#include "ai/ai.h" |
|
4261
2ec8f5a9747b
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
4260
diff
changeset
|
28 |
#include "date.h" |
| 0 | 29 |
|
30 |
static const SpriteID cheeks_table[4] = {
|
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
31 |
0x325, 0x326, |
| 0 | 32 |
0x390, 0x3B0, |
33 |
}; |
|
34 |
||
35 |
static const SpriteID mouth_table[3] = {
|
|
36 |
0x34C, 0x34D, 0x34F |
|
37 |
}; |
|
38 |
||
39 |
void DrawPlayerFace(uint32 face, int color, int x, int y) |
|
40 |
{
|
|
41 |
byte flag = 0; |
|
42 |
||
43 |
if ( (int32)face < 0) |
|
44 |
flag |= 1; |
|
45 |
if ((((((face >> 7) ^ face) >> 7) ^ face) & 0x8080000) == 0x8000000) |
|
46 |
flag |= 2; |
|
47 |
||
48 |
/* draw the gradient */ |
|
|
3351
79a35ca72b84
(svn r4136) CodeChange : Revert part of r4092 (as spotted by Tron) and clean-up a little further
belugas
parents:
3326
diff
changeset
|
49 |
DrawSprite(GENERAL_SPRITE_COLOR(color) + SPRITE_PALETTE(SPR_GRADIENT), x, y); |
| 0 | 50 |
|
51 |
/* draw the cheeks */ |
|
52 |
DrawSprite(cheeks_table[flag&3], x, y); |
|
53 |
||
54 |
/* draw the chin */ |
|
55 |
/* FIXME: real code uses -2 in zoomlevel 1 */ |
|
56 |
{
|
|
|
2140
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2119
diff
changeset
|
57 |
uint val = GB(face, 4, 2); |
| 0 | 58 |
if (!(flag & 2)) {
|
59 |
DrawSprite(0x327 + (flag&1?0:val), x, y); |
|
60 |
} else {
|
|
61 |
DrawSprite((flag&1?0x3B1:0x391) + (val>>1), x, y); |
|
62 |
} |
|
63 |
} |
|
64 |
/* draw the eyes */ |
|
65 |
{
|
|
|
2140
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2119
diff
changeset
|
66 |
uint val1 = GB(face, 6, 4); |
|
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2119
diff
changeset
|
67 |
uint val2 = GB(face, 20, 3); |
|
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
68 |
uint32 high = 0x314 << PALETTE_SPRITE_START; |
| 0 | 69 |
|
70 |
if (val2 >= 6) {
|
|
|
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
71 |
high = 0x30F << PALETTE_SPRITE_START; |
| 0 | 72 |
if (val2 != 6) |
|
2187
2a51f8925eeb
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
celestar
parents:
2186
diff
changeset
|
73 |
high = 0x30D << PALETTE_SPRITE_START; |
| 0 | 74 |
} |
75 |
||
76 |
if (!(flag & 2)) {
|
|
77 |
if (!(flag & 1)) {
|
|
|
3326
b5ce3e805425
(svn r4092) CodeChange : Named sprites instead of magic numbers plus create/use helper macro/enum for recoloring scheme
belugas
parents:
3222
diff
changeset
|
78 |
DrawSprite(high+((val1 * 12 >> 4) + SPRITE_PALETTE(0x32B)), x, y); |
| 0 | 79 |
} else {
|
|
3351
79a35ca72b84
(svn r4136) CodeChange : Revert part of r4092 (as spotted by Tron) and clean-up a little further
belugas
parents:
3326
diff
changeset
|
80 |
DrawSprite(high+(val1 + SPRITE_PALETTE(0x337)), x, y); |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
81 |
} |
| 0 | 82 |
} else {
|
83 |
if (!(flag & 1)) {
|
|
|
3351
79a35ca72b84
(svn r4136) CodeChange : Revert part of r4092 (as spotted by Tron) and clean-up a little further
belugas
parents:
3326
diff
changeset
|
84 |
DrawSprite(high+((val1 * 11 >> 4) + SPRITE_PALETTE(0x39A)), x, y); |
| 0 | 85 |
} else {
|
|
3326
b5ce3e805425
(svn r4092) CodeChange : Named sprites instead of magic numbers plus create/use helper macro/enum for recoloring scheme
belugas
parents:
3222
diff
changeset
|
86 |
DrawSprite(high+(val1 + SPRITE_PALETTE(0x3B8)), x, y); |
| 0 | 87 |
} |
88 |
} |
|
89 |
} |
|
90 |
||
91 |
/* draw the mouth */ |
|
92 |
{
|
|
|
2140
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2119
diff
changeset
|
93 |
uint val = GB(face, 10, 6); |
| 0 | 94 |
uint val2; |
95 |
||
96 |
if (!(flag&1)) {
|
|
97 |
val2 = ((val&0xF) * 15 >> 4); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
98 |
|
| 0 | 99 |
if (val2 < 3) {
|
100 |
DrawSprite((flag&2 ? 0x397 : 0x367) + val2, x, y); |
|
101 |
/* skip the rest */ |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
102 |
goto skip_mouth; |
| 0 | 103 |
} |
104 |
||
105 |
val2 -= 3; |
|
106 |
if (flag & 2) {
|
|
107 |
if (val2 > 8) val2 = 0; |
|
108 |
val2 += 0x3A5 - 0x35B; |
|
109 |
} |
|
110 |
DrawSprite(val2 + 0x35B, x, y); |
|
111 |
} else if (!(flag&2)) {
|
|
112 |
DrawSprite(((val&0xF) * 10 >> 4) + 0x351, x, y); |
|
113 |
} else {
|
|
114 |
DrawSprite(((val&0xF) * 9 >> 4) + 0x3C8, x, y); |
|
115 |
} |
|
116 |
||
117 |
val >>= 3; |
|
118 |
||
119 |
if (!(flag&2)) {
|
|
120 |
if (!(flag&1)) {
|
|
121 |
DrawSprite(0x349 + val, x, y); |
|
122 |
} else {
|
|
123 |
DrawSprite( mouth_table[(val*3>>3)], x, y); |
|
124 |
} |
|
125 |
} else {
|
|
126 |
if (!(flag&1)) {
|
|
127 |
DrawSprite(0x393 + (val&3), x, y); |
|
128 |
} else {
|
|
129 |
DrawSprite(0x3B3 + (val*5>>3), x, y); |
|
130 |
} |
|
131 |
} |
|
132 |
||
133 |
skip_mouth:; |
|
134 |
} |
|
135 |
||
136 |
||
137 |
/* draw the hair */ |
|
138 |
{
|
|
|
2140
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2119
diff
changeset
|
139 |
uint val = GB(face, 16, 4); |
| 2639 | 140 |
if (flag & 2) {
|
141 |
if (flag & 1) {
|
|
142 |
DrawSprite(0x3D9 + (val * 5 >> 4), x, y); |
|
| 0 | 143 |
} else {
|
| 2639 | 144 |
DrawSprite(0x3D4 + (val * 5 >> 4), x, y); |
| 0 | 145 |
} |
146 |
} else {
|
|
| 2639 | 147 |
if (flag & 1) {
|
148 |
DrawSprite(0x38B + (val * 5 >> 4), x, y); |
|
| 0 | 149 |
} else {
|
| 2639 | 150 |
DrawSprite(0x382 + (val * 9 >> 4), x, y); |
| 0 | 151 |
} |
152 |
} |
|
153 |
} |
|
154 |
||
155 |
/* draw the tie */ |
|
156 |
{
|
|
|
2140
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2119
diff
changeset
|
157 |
uint val = GB(face, 20, 8); |
| 0 | 158 |
|
159 |
if (!(flag&1)) {
|
|
| 2635 | 160 |
DrawSprite(0x36B + (GB(val, 0, 2) * 3 >> 2), x, y); |
161 |
DrawSprite(0x36E + (GB(val, 2, 2) * 4 >> 2), x, y); |
|
162 |
DrawSprite(0x372 + (GB(val, 4, 4) * 6 >> 4), x, y); |
|
| 0 | 163 |
} else {
|
| 2635 | 164 |
DrawSprite(0x378 + (GB(val, 0, 2) * 3 >> 2), x, y); |
165 |
DrawSprite(0x37B + (GB(val, 2, 2) * 4 >> 2), x, y); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
166 |
|
| 0 | 167 |
val >>= 4; |
| 2639 | 168 |
if (val < 3) DrawSprite((flag & 2 ? 0x3D1 : 0x37F) + val, x, y); |
| 0 | 169 |
} |
170 |
} |
|
171 |
||
172 |
/* draw the glasses */ |
|
173 |
{
|
|
|
2140
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2119
diff
changeset
|
174 |
uint val = GB(face, 28, 3); |
| 0 | 175 |
|
| 2639 | 176 |
if (flag & 2) {
|
177 |
if (val <= 1) DrawSprite(0x3AE + val, x, y); |
|
| 0 | 178 |
} else {
|
| 2639 | 179 |
if (val <= 1) DrawSprite(0x347 + val, x, y); |
| 0 | 180 |
} |
181 |
} |
|
182 |
} |
|
183 |
||
|
2944
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
184 |
byte ActivePlayerCount(void) |
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
185 |
{
|
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
186 |
const Player *p; |
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
187 |
byte count = 0; |
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
188 |
|
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
189 |
FOR_ALL_PLAYERS(p) {
|
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
190 |
if (p->is_active) count++; |
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
191 |
} |
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
192 |
|
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
193 |
return count; |
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
194 |
} |
|
7c392e7b51c6
(svn r3500) - Workaround the inaccurate count of spectators/companies that can happen in certain border-cases. For now just dynamically get this value when requested so it is always right. To do properly all player/client creation/destruction needs a hook for networking.
Darkvater
parents:
2913
diff
changeset
|
195 |
|
| 2475 | 196 |
void InvalidatePlayerWindows(const Player *p) |
| 0 | 197 |
{
|
|
2150
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2147
diff
changeset
|
198 |
PlayerID pid = p->index; |
| 0 | 199 |
|
|
2150
010d923a81a9
(svn r2660) Get rid of some more shifting/anding/casting
tron
parents:
2147
diff
changeset
|
200 |
if (pid == _local_player) InvalidateWindow(WC_STATUS_BAR, 0); |
| 0 | 201 |
InvalidateWindow(WC_FINANCES, pid); |
202 |
} |
|
203 |
||
204 |
bool CheckPlayerHasMoney(int32 cost) |
|
205 |
{
|
|
206 |
if (cost > 0) {
|
|
|
2498
befad2fe53d2
(svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants
tron
parents:
2484
diff
changeset
|
207 |
PlayerID pid = _current_player; |
|
1962
51ee4f459268
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1901
diff
changeset
|
208 |
if (pid < MAX_PLAYERS && cost > GetPlayer(pid)->player_money) {
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
209 |
SetDParam(0, cost); |
| 0 | 210 |
_error_message = STR_0003_NOT_ENOUGH_CASH_REQUIRES; |
211 |
return false; |
|
212 |
} |
|
213 |
} |
|
214 |
return true; |
|
215 |
} |
|
216 |
||
217 |
static void SubtractMoneyFromAnyPlayer(Player *p, int32 cost) |
|
218 |
{
|
|
219 |
p->money64 -= cost; |
|
220 |
UpdatePlayerMoney32(p); |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
221 |
|
| 0 | 222 |
p->yearly_expenses[0][_yearly_expenses_type] += cost; |
223 |
||
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
224 |
if (HASBIT(1<<7|1<<8|1<<9|1<<10, _yearly_expenses_type)) {
|
| 0 | 225 |
p->cur_economy.income -= cost; |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
226 |
} else if (HASBIT(1<<2|1<<3|1<<4|1<<5|1<<6|1<<11, _yearly_expenses_type)) {
|
| 0 | 227 |
p->cur_economy.expenses -= cost; |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
228 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
229 |
|
| 0 | 230 |
InvalidatePlayerWindows(p); |
231 |
} |
|
232 |
||
233 |
void SubtractMoneyFromPlayer(int32 cost) |
|
234 |
{
|
|
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
235 |
PlayerID pid = _current_player; |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
236 |
|
|
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
237 |
if (pid < MAX_PLAYERS) SubtractMoneyFromAnyPlayer(GetPlayer(pid), cost); |
| 0 | 238 |
} |
239 |
||
|
2436
177cb6a8339f
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2425
diff
changeset
|
240 |
void SubtractMoneyFromPlayerFract(PlayerID player, int32 cost) |
| 0 | 241 |
{
|
|
1962
51ee4f459268
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1901
diff
changeset
|
242 |
Player *p = GetPlayer(player); |
| 0 | 243 |
byte m = p->player_money_fraction; |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
244 |
|
| 0 | 245 |
p->player_money_fraction = m - (byte)cost; |
246 |
cost >>= 8; |
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
247 |
if (p->player_money_fraction > m) cost++; |
|
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
248 |
if (cost != 0) SubtractMoneyFromAnyPlayer(p, cost); |
| 0 | 249 |
} |
250 |
||
251 |
// the player_money field is kept as it is, but money64 contains the actual amount of money. |
|
252 |
void UpdatePlayerMoney32(Player *p) |
|
253 |
{
|
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
254 |
if (p->money64 < -2000000000) {
|
| 0 | 255 |
p->player_money = -2000000000; |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
256 |
} else if (p->money64 > 2000000000) {
|
| 0 | 257 |
p->player_money = 2000000000; |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
258 |
} else {
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
259 |
p->player_money = (int32)p->money64; |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
260 |
} |
| 0 | 261 |
} |
262 |
||
|
2436
177cb6a8339f
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2425
diff
changeset
|
263 |
void GetNameOfOwner(PlayerID owner, TileIndex tile) |
| 0 | 264 |
{
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
265 |
SetDParam(2, owner); |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
266 |
|
| 0 | 267 |
if (owner != OWNER_TOWN) {
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
268 |
if (owner >= MAX_PLAYERS) {
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
269 |
SetDParam(0, STR_0150_SOMEONE); |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
270 |
} else {
|
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
271 |
const Player* p = GetPlayer(owner); |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
272 |
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
273 |
SetDParam(0, p->name_1); |
|
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
274 |
SetDParam(1, p->name_2); |
| 0 | 275 |
} |
276 |
} else {
|
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
277 |
const Town* t = ClosestTownFromTile(tile, (uint)-1); |
|
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
278 |
|
|
2070
26c657906f25
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
1977
diff
changeset
|
279 |
SetDParam(0, STR_TOWN); |
|
26c657906f25
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
ludde
parents:
1977
diff
changeset
|
280 |
SetDParam(1, t->index); |
| 0 | 281 |
} |
282 |
} |
|
283 |
||
284 |
||
|
2436
177cb6a8339f
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
Darkvater
parents:
2425
diff
changeset
|
285 |
bool CheckOwnership(PlayerID owner) |
| 0 | 286 |
{
|
287 |
assert(owner <= OWNER_WATER); |
|
288 |
||
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
289 |
if (owner == _current_player) return true; |
| 0 | 290 |
_error_message = STR_013B_OWNED_BY; |
291 |
GetNameOfOwner(owner, 0); |
|
292 |
return false; |
|
293 |
} |
|
294 |
||
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1962
diff
changeset
|
295 |
bool CheckTileOwnership(TileIndex tile) |
| 0 | 296 |
{
|
|
2498
befad2fe53d2
(svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants
tron
parents:
2484
diff
changeset
|
297 |
PlayerID owner = GetTileOwner(tile); |
|
1901
fb05044cf5c3
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
298 |
|
| 0 | 299 |
assert(owner <= OWNER_WATER); |
|
1901
fb05044cf5c3
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
tron
parents:
1891
diff
changeset
|
300 |
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
301 |
if (owner == _current_player) return true; |
| 0 | 302 |
_error_message = STR_013B_OWNED_BY; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
303 |
|
| 0 | 304 |
// no need to get the name of the owner unless we're the local player (saves some time) |
|
2425
99e1e8430a28
(svn r2951) - Fix: [ 1259345 ] Changing engine in netgame opens train window for everyone
Darkvater
parents:
2395
diff
changeset
|
305 |
if (IsLocalPlayer()) GetNameOfOwner(owner, tile); |
| 0 | 306 |
return false; |
307 |
} |
|
308 |
||
309 |
static void GenerateCompanyName(Player *p) |
|
310 |
{
|
|
|
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1962
diff
changeset
|
311 |
TileIndex tile; |
| 0 | 312 |
Town *t; |
313 |
StringID str; |
|
314 |
Player *pp; |
|
315 |
uint32 strp; |
|
316 |
char buffer[100]; |
|
317 |
||
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
318 |
if (p->name_1 != STR_SV_UNNAMED) return; |
| 0 | 319 |
|
320 |
tile = p->last_build_coordinate; |
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
321 |
if (tile == 0) return; |
| 0 | 322 |
|
323 |
t = ClosestTownFromTile(tile, (uint)-1); |
|
324 |
||
325 |
if (IS_INT_INSIDE(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST+1)) {
|
|
326 |
str = t->townnametype - SPECSTR_TOWNNAME_START + SPECSTR_PLAYERNAME_START; |
|
327 |
strp = t->townnameparts; |
|
328 |
||
329 |
verify_name:; |
|
330 |
// No player must have this name already |
|
331 |
FOR_ALL_PLAYERS(pp) {
|
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
332 |
if (pp->name_1 == str && pp->name_2 == strp) goto bad_town_name; |
| 0 | 333 |
} |
334 |
||
335 |
GetString(buffer, str); |
|
336 |
if (strlen(buffer) >= 32 || GetStringWidth(buffer) >= 150) |
|
337 |
goto bad_town_name; |
|
338 |
||
339 |
set_name:; |
|
340 |
p->name_1 = str; |
|
341 |
p->name_2 = strp; |
|
342 |
||
343 |
MarkWholeScreenDirty(); |
|
344 |
||
345 |
if (!IS_HUMAN_PLAYER(p->index)) {
|
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
346 |
SetDParam(0, t->index); |
| 0 | 347 |
AddNewsItem(p->index + (4 << 4), NEWS_FLAGS(NM_CALLBACK, NF_TILE, NT_COMPANY_INFO, DNC_BANKRUPCY), p->last_build_coordinate, 0); |
348 |
} |
|
349 |
return; |
|
350 |
} |
|
351 |
bad_town_name:; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
352 |
|
| 0 | 353 |
if (p->president_name_1 == SPECSTR_PRESIDENT_NAME) {
|
354 |
str = SPECSTR_ANDCO_NAME; |
|
355 |
strp = p->president_name_2; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
356 |
goto set_name; |
| 0 | 357 |
} else {
|
358 |
str = SPECSTR_ANDCO_NAME; |
|
359 |
strp = Random(); |
|
360 |
goto verify_name; |
|
361 |
} |
|
362 |
} |
|
363 |
||
364 |
#define COLOR_SWAP(i,j) do { byte t=colors[i];colors[i]=colors[j];colors[j]=t; } while(0)
|
|
365 |
||
366 |
static const byte _color_sort[16] = {2, 2, 3, 2, 3, 2, 3, 2, 3, 2, 2, 2, 3, 1, 1, 1};
|
|
367 |
static const byte _color_similar_1[16] = {8, 6, 255, 12, 255, 0, 1, 1, 0, 13, 11, 10, 3, 9, 15, 14};
|
|
368 |
static const byte _color_similar_2[16] = {5, 7, 255, 255, 255, 8, 7, 6, 5, 12, 255, 255, 9, 255, 255, 255};
|
|
369 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1021
diff
changeset
|
370 |
static byte GeneratePlayerColor(void) |
| 0 | 371 |
{
|
372 |
byte colors[16], pcolor, t2; |
|
373 |
int i,j,n; |
|
374 |
uint32 r; |
|
375 |
Player *p; |
|
376 |
||
377 |
// Initialize array |
|
| 2952 | 378 |
for (i = 0; i != 16; i++) colors[i] = i; |
| 0 | 379 |
|
380 |
// And randomize it |
|
381 |
n = 100; |
|
382 |
do {
|
|
383 |
r = Random(); |
|
|
2140
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2119
diff
changeset
|
384 |
COLOR_SWAP(GB(r, 0, 4), GB(r, 4, 4)); |
| 0 | 385 |
} while (--n); |
386 |
||
387 |
// Bubble sort it according to the values in table 1 |
|
388 |
i = 16; |
|
389 |
do {
|
|
| 2952 | 390 |
for (j = 0; j != 15; j++) {
|
391 |
if (_color_sort[colors[j]] < _color_sort[colors[j + 1]]) {
|
|
392 |
COLOR_SWAP(j, j + 1); |
|
| 0 | 393 |
} |
394 |
} |
|
395 |
} while (--i); |
|
396 |
||
397 |
// Move the colors that look similar to each player's color to the side |
|
398 |
FOR_ALL_PLAYERS(p) if (p->is_active) {
|
|
399 |
pcolor = p->player_color; |
|
| 2952 | 400 |
for (i=0; i!=16; i++) if (colors[i] == pcolor) {
|
| 0 | 401 |
colors[i] = 0xFF; |
402 |
||
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
403 |
t2 = _color_similar_1[pcolor]; |
| 0 | 404 |
if (t2 == 0xFF) break; |
| 2952 | 405 |
for (i=0; i!=15; i++) {
|
| 0 | 406 |
if (colors[i] == t2) {
|
407 |
do COLOR_SWAP(i,i+1); while (++i != 15); |
|
408 |
break; |
|
409 |
} |
|
410 |
} |
|
411 |
||
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
412 |
t2 = _color_similar_2[pcolor]; |
| 0 | 413 |
if (t2 == 0xFF) break; |
| 2952 | 414 |
for (i = 0; i != 15; i++) {
|
| 0 | 415 |
if (colors[i] == t2) {
|
| 2952 | 416 |
do COLOR_SWAP(i, i + 1); while (++i != 15); |
| 0 | 417 |
break; |
418 |
} |
|
419 |
} |
|
420 |
break; |
|
421 |
} |
|
422 |
} |
|
423 |
||
424 |
// Return the first available color |
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
425 |
for (i = 0;; i++) {
|
|
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
426 |
if (colors[i] != 0xFF) return colors[i]; |
| 0 | 427 |
} |
428 |
} |
|
429 |
||
430 |
static void GeneratePresidentName(Player *p) |
|
431 |
{
|
|
432 |
Player *pp; |
|
433 |
char buffer[100], buffer2[40]; |
|
434 |
||
| 2952 | 435 |
for (;;) {
|
| 0 | 436 |
restart:; |
437 |
||
438 |
p->president_name_2 = Random(); |
|
439 |
p->president_name_1 = SPECSTR_PRESIDENT_NAME; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
440 |
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
441 |
SetDParam(0, p->president_name_2); |
| 0 | 442 |
GetString(buffer, p->president_name_1); |
443 |
if (strlen(buffer) >= 32 || GetStringWidth(buffer) >= 94) |
|
444 |
continue; |
|
445 |
||
446 |
FOR_ALL_PLAYERS(pp) {
|
|
447 |
if (pp->is_active && p != pp) {
|
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
448 |
SetDParam(0, pp->president_name_2); |
| 0 | 449 |
GetString(buffer2, pp->president_name_1); |
|
1304
8570010abe7b
(svn r1808) Use strcmp() instead of home brewed function str_eq()
tron
parents:
1174
diff
changeset
|
450 |
if (strcmp(buffer2, buffer) == 0) |
| 0 | 451 |
goto restart; |
452 |
} |
|
453 |
} |
|
454 |
return; |
|
455 |
} |
|
456 |
} |
|
457 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1021
diff
changeset
|
458 |
static Player *AllocatePlayer(void) |
| 0 | 459 |
{
|
460 |
Player *p; |
|
461 |
// Find a free slot |
|
462 |
FOR_ALL_PLAYERS(p) {
|
|
463 |
if (!p->is_active) {
|
|
464 |
int i = p->index; |
|
465 |
memset(p, 0, sizeof(Player)); |
|
466 |
p->index = i; |
|
467 |
return p; |
|
468 |
} |
|
469 |
} |
|
470 |
return NULL; |
|
471 |
} |
|
472 |
||
473 |
Player *DoStartupNewPlayer(bool is_ai) |
|
474 |
{
|
|
475 |
Player *p; |
|
476 |
||
477 |
p = AllocatePlayer(); |
|
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
478 |
if (p == NULL) return NULL; |
| 0 | 479 |
|
480 |
// Make a color |
|
481 |
p->player_color = GeneratePlayerColor(); |
|
|
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
482 |
_player_colors[p->index] = p->player_color; |
| 0 | 483 |
p->name_1 = STR_SV_UNNAMED; |
484 |
p->is_active = true; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
485 |
|
| 0 | 486 |
p->money64 = p->player_money = p->current_loan = 100000; |
487 |
||
488 |
p->is_ai = is_ai; |
|
489 |
p->ai.state = 5; /* AIS_WANT_NEW_ROUTE */ |
|
|
2469
1bfbb0dc0b75
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
tron
parents:
2436
diff
changeset
|
490 |
p->share_owners[0] = p->share_owners[1] = p->share_owners[2] = p->share_owners[3] = OWNER_SPECTATOR; |
| 0 | 491 |
|
|
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
492 |
p->avail_railtypes = GetPlayerRailtypes(p->index); |
| 0 | 493 |
p->inaugurated_year = _cur_year; |
494 |
p->face = Random(); |
|
495 |
||
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
496 |
/* Engine renewal settings */ |
| 2848 | 497 |
p->engine_renew_list = NULL; |
|
2617
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
498 |
p->renew_keep_length = false; |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
499 |
p->engine_renew = false; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
500 |
p->engine_renew_months = -6; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
501 |
p->engine_renew_money = 100000; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
502 |
|
| 0 | 503 |
GeneratePresidentName(p); |
504 |
||
505 |
InvalidateWindow(WC_GRAPH_LEGEND, 0); |
|
506 |
InvalidateWindow(WC_TOOLBAR_MENU, 0); |
|
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
507 |
InvalidateWindow(WC_CLIENT_LIST, 0); |
| 0 | 508 |
|
|
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
509 |
if (is_ai && (!_networking || _network_server) && _ai.enabled) |
|
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
510 |
AI_StartNewAI(p->index); |
|
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
511 |
|
| 0 | 512 |
return p; |
513 |
} |
|
514 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1021
diff
changeset
|
515 |
void StartupPlayers(void) |
| 0 | 516 |
{
|
| 23 | 517 |
// The AI starts like in the setting with +2 month max |
|
165
f81fa8c27236
(svn r166) -Codechange: change 74 for constant DAY_TICKS
darkvater
parents:
84
diff
changeset
|
518 |
_next_competitor_start = _opt.diff.competitor_start_time * 90 * DAY_TICKS + RandomRange(60 * DAY_TICKS) + 1; |
| 0 | 519 |
} |
520 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1021
diff
changeset
|
521 |
static void MaybeStartNewPlayer(void) |
| 0 | 522 |
{
|
523 |
uint n; |
|
524 |
Player *p; |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
525 |
|
| 0 | 526 |
// count number of competitors |
527 |
n = 0; |
|
|
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
528 |
FOR_ALL_PLAYERS(p) {
|
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
529 |
if (p->is_active && p->is_ai) n++; |
|
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
530 |
} |
| 0 | 531 |
|
532 |
// when there's a lot of computers in game, the probability that a new one starts is lower |
|
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
533 |
if (n < (uint)_opt.diff.max_no_competitors && |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
534 |
n < (_network_server ? |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
535 |
InteractiveRandomRange(_opt.diff.max_no_competitors + 2) : |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
536 |
RandomRange(_opt.diff.max_no_competitors + 2) |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
537 |
)) {
|
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
538 |
/* Send a command to all clients to start up a new AI. |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
539 |
* Works fine for Multiplayer and Singleplayer */ |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
540 |
DoCommandP(0, 1, 0, NULL, CMD_PLAYER_CTRL); |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
541 |
} |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
542 |
|
| 23 | 543 |
// The next AI starts like the difficulty setting said, with +2 month max |
|
2092
c30495feef79
(svn r2602) -Codechange: removed unused variable (disable_computer)
truelight
parents:
2070
diff
changeset
|
544 |
_next_competitor_start = _opt.diff.competitor_start_time * 90 * DAY_TICKS + 1; |
|
2682
94ca0b4dc53f
(svn r3224) -Add: Allow the NewAI to work in Multiplayer Games (switchable via patch
truelight
parents:
2639
diff
changeset
|
545 |
_next_competitor_start += _network_server ? InteractiveRandomRange(60 * DAY_TICKS) : RandomRange(60 * DAY_TICKS); |
| 0 | 546 |
} |
547 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1021
diff
changeset
|
548 |
void InitializePlayers(void) |
| 0 | 549 |
{
|
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
550 |
uint i; |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
551 |
|
| 0 | 552 |
memset(_players, 0, sizeof(_players)); |
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
553 |
for (i = 0; i != MAX_PLAYERS; i++) _players[i].index = i; |
| 0 | 554 |
_cur_player_tick_index = 0; |
555 |
} |
|
556 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1021
diff
changeset
|
557 |
void OnTick_Players(void) |
| 0 | 558 |
{
|
559 |
Player *p; |
|
560 |
||
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
561 |
if (_game_mode == GM_EDITOR) return; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
562 |
|
|
1962
51ee4f459268
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1901
diff
changeset
|
563 |
p = GetPlayer(_cur_player_tick_index); |
| 0 | 564 |
_cur_player_tick_index = (_cur_player_tick_index + 1) % MAX_PLAYERS; |
565 |
if (p->name_1 != 0) GenerateCompanyName(p); |
|
566 |
||
|
2682
94ca0b4dc53f
(svn r3224) -Add: Allow the NewAI to work in Multiplayer Games (switchable via patch
truelight
parents:
2639
diff
changeset
|
567 |
if (AI_AllowNewAI() && _game_mode != GM_MENU && !--_next_competitor_start) |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
568 |
MaybeStartNewPlayer(); |
| 0 | 569 |
} |
570 |
||
|
2
104b2984cd3e
(svn r3) -[1005611] Player Window patch: When looking in dropdownlist for player stuff, it will say
darkvater
parents:
1
diff
changeset
|
571 |
// index is the next parameter in _decode_parameters to set up |
| 2475 | 572 |
StringID GetPlayerNameString(PlayerID player, uint index) |
| 0 | 573 |
{
|
|
2
104b2984cd3e
(svn r3) -[1005611] Player Window patch: When looking in dropdownlist for player stuff, it will say
darkvater
parents:
1
diff
changeset
|
574 |
if (IS_HUMAN_PLAYER(player) && player < MAX_PLAYERS) {
|
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
575 |
SetDParam(index, player+1); |
|
2
104b2984cd3e
(svn r3) -[1005611] Player Window patch: When looking in dropdownlist for player stuff, it will say
darkvater
parents:
1
diff
changeset
|
576 |
return STR_7002_PLAYER; |
|
104b2984cd3e
(svn r3) -[1005611] Player Window patch: When looking in dropdownlist for player stuff, it will say
darkvater
parents:
1
diff
changeset
|
577 |
} |
| 0 | 578 |
return STR_EMPTY; |
579 |
} |
|
580 |
||
581 |
extern void ShowPlayerFinances(int player); |
|
582 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1021
diff
changeset
|
583 |
void PlayersYearlyLoop(void) |
| 0 | 584 |
{
|
585 |
Player *p; |
|
586 |
||
587 |
// Copy statistics |
|
588 |
FOR_ALL_PLAYERS(p) {
|
|
589 |
if (p->is_active) {
|
|
590 |
memmove(&p->yearly_expenses[1], &p->yearly_expenses[0], sizeof(p->yearly_expenses) - sizeof(p->yearly_expenses[0])); |
|
591 |
memset(&p->yearly_expenses[0], 0, sizeof(p->yearly_expenses[0])); |
|
592 |
InvalidateWindow(WC_FINANCES, p->index); |
|
593 |
} |
|
594 |
} |
|
595 |
||
| 1 | 596 |
if (_patches.show_finances && _local_player != OWNER_SPECTATOR) {
|
| 0 | 597 |
ShowPlayerFinances(_local_player); |
|
1962
51ee4f459268
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1901
diff
changeset
|
598 |
p = GetPlayer(_local_player); |
| 0 | 599 |
if (p->num_valid_stat_ent > 5 && p->old_economy[0].performance_history < p->old_economy[4].performance_history) {
|
| 541 | 600 |
SndPlayFx(SND_01_BAD_YEAR); |
| 0 | 601 |
} else {
|
| 541 | 602 |
SndPlayFx(SND_00_GOOD_YEAR); |
| 0 | 603 |
} |
604 |
} |
|
605 |
} |
|
606 |
||
| 2544 | 607 |
void DeletePlayerWindows(PlayerID pi) |
| 0 | 608 |
{
|
609 |
DeleteWindowById(WC_COMPANY, pi); |
|
610 |
DeleteWindowById(WC_FINANCES, pi); |
|
611 |
DeleteWindowById(WC_STATION_LIST, pi); |
|
| 2544 | 612 |
DeleteWindowById(WC_TRAINS_LIST, (INVALID_STATION << 16) | pi); |
613 |
DeleteWindowById(WC_ROADVEH_LIST, (INVALID_STATION << 16) | pi); |
|
614 |
DeleteWindowById(WC_SHIPS_LIST, (INVALID_STATION << 16) | pi); |
|
615 |
DeleteWindowById(WC_AIRCRAFT_LIST, (INVALID_STATION << 16) | pi); |
|
| 0 | 616 |
DeleteWindowById(WC_BUY_COMPANY, pi); |
617 |
} |
|
618 |
||
| 2544 | 619 |
byte GetPlayerRailtypes(PlayerID p) |
|
2147
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2140
diff
changeset
|
620 |
{
|
|
2554
cd74b7099965
(svn r3087) Rewrite GetPlayerRailtypes() so it doesn't depend on magical numbers to sort out wagons
tron
parents:
2548
diff
changeset
|
621 |
byte rt = 0; |
|
2634
16334e1a4862
(svn r3176) Use proper types, not some variants of int
tron
parents:
2617
diff
changeset
|
622 |
EngineID i; |
|
2147
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2140
diff
changeset
|
623 |
|
|
2554
cd74b7099965
(svn r3087) Rewrite GetPlayerRailtypes() so it doesn't depend on magical numbers to sort out wagons
tron
parents:
2548
diff
changeset
|
624 |
for (i = 0; i != TOTAL_NUM_ENGINES; i++) {
|
|
cd74b7099965
(svn r3087) Rewrite GetPlayerRailtypes() so it doesn't depend on magical numbers to sort out wagons
tron
parents:
2548
diff
changeset
|
625 |
const Engine* e = GetEngine(i); |
|
3393
48ce4c723a76
(svn r4201) - Codechange: Do for _engine_info[] what we do for _*_vehicle_info[]; create and use a function to retrieve data, and ensure constness.
peter1138
parents:
3351
diff
changeset
|
626 |
const EngineInfo *ei = EngInfo(i); |
|
2147
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2140
diff
changeset
|
627 |
|
|
2913
fca9b500c9f9
(svn r3468) - Fix: Rail type availability should take climate type into account.
peter1138
parents:
2879
diff
changeset
|
628 |
if (e->type == VEH_Train && HASBIT(ei->climates, _opt.landscape) && |
|
2990
352b4590ee1c
(svn r3565) - Fix: On loading a game, GetPlayerRailtypes() didn't account for the fact that vehicles are introduced a year after their introduction date. This will also relieve possible (rare) network desyncs.
peter1138
parents:
2988
diff
changeset
|
629 |
(HASBIT(e->player_avail, p) || _date >= (e->intro_date + 365)) && |
|
2554
cd74b7099965
(svn r3087) Rewrite GetPlayerRailtypes() so it doesn't depend on magical numbers to sort out wagons
tron
parents:
2548
diff
changeset
|
630 |
!(RailVehInfo(i)->flags & RVI_WAGON)) {
|
|
cd74b7099965
(svn r3087) Rewrite GetPlayerRailtypes() so it doesn't depend on magical numbers to sort out wagons
tron
parents:
2548
diff
changeset
|
631 |
assert(e->railtype < RAILTYPE_END); |
|
cd74b7099965
(svn r3087) Rewrite GetPlayerRailtypes() so it doesn't depend on magical numbers to sort out wagons
tron
parents:
2548
diff
changeset
|
632 |
SETBIT(rt, e->railtype); |
|
cd74b7099965
(svn r3087) Rewrite GetPlayerRailtypes() so it doesn't depend on magical numbers to sort out wagons
tron
parents:
2548
diff
changeset
|
633 |
} |
|
2147
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2140
diff
changeset
|
634 |
} |
|
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2140
diff
changeset
|
635 |
|
|
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2140
diff
changeset
|
636 |
return rt; |
|
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2140
diff
changeset
|
637 |
} |
|
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2140
diff
changeset
|
638 |
|
| 2544 | 639 |
static void DeletePlayerStuff(PlayerID pi) |
| 0 | 640 |
{
|
641 |
Player *p; |
|
642 |
||
643 |
DeletePlayerWindows(pi); |
|
|
1962
51ee4f459268
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1901
diff
changeset
|
644 |
p = GetPlayer(pi); |
| 0 | 645 |
DeleteName(p->name_1); |
646 |
DeleteName(p->president_name_1); |
|
647 |
p->name_1 = 0; |
|
648 |
p->president_name_1 = 0; |
|
649 |
} |
|
650 |
||
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
651 |
/** Change engine renewal parameters |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3393
diff
changeset
|
652 |
* @param tile unused |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
653 |
* @param p1 bits 0-3 command |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
654 |
* - p1 = 0 - change auto renew bool |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
655 |
* - p1 = 1 - change auto renew months |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
656 |
* - p1 = 2 - change auto renew money |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
657 |
* - p1 = 3 - change auto renew array |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
658 |
* - p1 = 4 - change bool, months & money all together |
|
2617
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
659 |
* - p1 = 5 - change renew_keep_length |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
660 |
* @param p2 value to set |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
661 |
* if p1 = 0, then: |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
662 |
* - p2 = enable engine renewal |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
663 |
* if p1 = 1, then: |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
664 |
* - p2 = months left before engine expires to replace it |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
665 |
* if p1 = 2, then |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
666 |
* - p2 = minimum amount of money available |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
667 |
* if p1 = 3, then: |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
668 |
* - p2 bits 0-15 = old engine type |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
669 |
* - p2 bits 16-31 = new engine type |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
670 |
* if p1 = 4, then: |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
671 |
* - p1 bit 15 = enable engine renewal |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
672 |
* - p1 bits 16-31 = months left before engine expires to replace it |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
673 |
* - p2 bits 0-31 = minimum amount of money available |
|
2617
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
674 |
* if p1 = 5, then |
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
675 |
* - p2 = enable renew_keep_length |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
676 |
*/ |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3393
diff
changeset
|
677 |
int32 CmdReplaceVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
678 |
{
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
679 |
Player *p; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
680 |
if (!(_current_player < MAX_PLAYERS)) |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
681 |
return CMD_ERROR; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
682 |
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
683 |
p = GetPlayer(_current_player); |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
684 |
switch (GB(p1, 0, 3)) {
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
685 |
case 0: |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
686 |
if (p->engine_renew == (bool)GB(p2, 0, 1)) |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
687 |
return CMD_ERROR; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
688 |
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
689 |
if (flags & DC_EXEC) {
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
690 |
p->engine_renew = (bool)GB(p2, 0, 1); |
|
2425
99e1e8430a28
(svn r2951) - Fix: [ 1259345 ] Changing engine in netgame opens train window for everyone
Darkvater
parents:
2395
diff
changeset
|
691 |
if (IsLocalPlayer()) {
|
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
692 |
_patches.autorenew = p->engine_renew; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
693 |
InvalidateWindow(WC_GAME_OPTIONS, 0); |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
694 |
} |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
695 |
} |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
696 |
break; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
697 |
case 1: |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
698 |
if (p->engine_renew_months == (int16)p2) |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
699 |
return CMD_ERROR; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
700 |
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
701 |
if (flags & DC_EXEC) {
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
702 |
p->engine_renew_months = (int16)p2; |
|
2425
99e1e8430a28
(svn r2951) - Fix: [ 1259345 ] Changing engine in netgame opens train window for everyone
Darkvater
parents:
2395
diff
changeset
|
703 |
if (IsLocalPlayer()) {
|
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
704 |
_patches.autorenew_months = p->engine_renew_months; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
705 |
InvalidateWindow(WC_GAME_OPTIONS, 0); |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
706 |
} |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
707 |
} |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
708 |
break; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
709 |
case 2: |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
710 |
if (p->engine_renew_money == (uint32)p2) |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
711 |
return CMD_ERROR; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
712 |
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
713 |
if (flags & DC_EXEC) {
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
714 |
p->engine_renew_money = (uint32)p2; |
|
2425
99e1e8430a28
(svn r2951) - Fix: [ 1259345 ] Changing engine in netgame opens train window for everyone
Darkvater
parents:
2395
diff
changeset
|
715 |
if (IsLocalPlayer()) {
|
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
716 |
_patches.autorenew_money = p->engine_renew_money; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
717 |
InvalidateWindow(WC_GAME_OPTIONS, 0); |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
718 |
} |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
719 |
} |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
720 |
break; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
721 |
case 3: {
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
722 |
EngineID old_engine_type = GB(p2, 0, 16); |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
723 |
EngineID new_engine_type = GB(p2, 16, 16); |
|
2811
a2f26f7361e3
(svn r3359) - Autoreplace GUI: When starting or stopping a replacement, redraw the replace window after the command has completed, rather than after calling the command.
peter1138
parents:
2795
diff
changeset
|
724 |
int32 cost; |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
725 |
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
726 |
if (new_engine_type != INVALID_ENGINE) {
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
727 |
/* First we make sure that it's a valid type the user requested |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
728 |
* check that it's an engine that is in the engine array */ |
| 2952 | 729 |
if (!IsEngineIndex(new_engine_type)) |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
730 |
return CMD_ERROR; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
731 |
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
732 |
// check that the new vehicle type is the same as the original one |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
733 |
if (GetEngine(old_engine_type)->type != GetEngine(new_engine_type)->type) |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
734 |
return CMD_ERROR; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
735 |
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
736 |
// make sure that we do not replace a plane with a helicopter or vise versa |
|
4023
b65af90447d2
(svn r5262) Add symbolic names for the aircraft subtypes. not perfect, but better than raw numbers
tron
parents:
4000
diff
changeset
|
737 |
if (GetEngine(new_engine_type)->type == VEH_Aircraft && |
|
b65af90447d2
(svn r5262) Add symbolic names for the aircraft subtypes. not perfect, but better than raw numbers
tron
parents:
4000
diff
changeset
|
738 |
(AircraftVehInfo(old_engine_type)->subtype & AIR_CTOL) != (AircraftVehInfo(new_engine_type)->subtype & AIR_CTOL)) |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
739 |
return CMD_ERROR; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
740 |
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
741 |
// make sure that the player can actually buy the new engine |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
742 |
if (!HASBIT(GetEngine(new_engine_type)->player_avail, _current_player)) |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
743 |
return CMD_ERROR; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
744 |
|
| 2848 | 745 |
cost = AddEngineReplacementForPlayer(p, old_engine_type, new_engine_type, flags); |
|
2697
c7b1a950c4cf
(svn r3239) - Codechange: Introduce and use helper functions for engine replacement code.
peter1138
parents:
2684
diff
changeset
|
746 |
} else {
|
| 2848 | 747 |
cost = RemoveEngineReplacementForPlayer(p, old_engine_type, flags); |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
748 |
} |
|
2811
a2f26f7361e3
(svn r3359) - Autoreplace GUI: When starting or stopping a replacement, redraw the replace window after the command has completed, rather than after calling the command.
peter1138
parents:
2795
diff
changeset
|
749 |
|
|
a2f26f7361e3
(svn r3359) - Autoreplace GUI: When starting or stopping a replacement, redraw the replace window after the command has completed, rather than after calling the command.
peter1138
parents:
2795
diff
changeset
|
750 |
if (IsLocalPlayer()) InvalidateWindow(WC_REPLACE_VEHICLE, GetEngine(old_engine_type)->type); |
|
a2f26f7361e3
(svn r3359) - Autoreplace GUI: When starting or stopping a replacement, redraw the replace window after the command has completed, rather than after calling the command.
peter1138
parents:
2795
diff
changeset
|
751 |
|
|
a2f26f7361e3
(svn r3359) - Autoreplace GUI: When starting or stopping a replacement, redraw the replace window after the command has completed, rather than after calling the command.
peter1138
parents:
2795
diff
changeset
|
752 |
return cost; |
|
2755
3098984d08c8
(svn r3300) Remove unreachable code - in this case some duplicate breaks
tron
parents:
2697
diff
changeset
|
753 |
} |
|
3098984d08c8
(svn r3300) Remove unreachable code - in this case some duplicate breaks
tron
parents:
2697
diff
changeset
|
754 |
|
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
755 |
case 4: |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
756 |
if (flags & DC_EXEC) {
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
757 |
p->engine_renew = (bool)GB(p1, 15, 1); |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
758 |
p->engine_renew_months = (int16)GB(p1, 16, 16); |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
759 |
p->engine_renew_money = (uint32)p2; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
760 |
|
|
2425
99e1e8430a28
(svn r2951) - Fix: [ 1259345 ] Changing engine in netgame opens train window for everyone
Darkvater
parents:
2395
diff
changeset
|
761 |
if (IsLocalPlayer()) {
|
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
762 |
_patches.autorenew = p->engine_renew; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
763 |
_patches.autorenew_months = p->engine_renew_months; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
764 |
_patches.autorenew_money = p->engine_renew_money; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
765 |
InvalidateWindow(WC_GAME_OPTIONS, 0); |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
766 |
} |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
767 |
} |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
768 |
break; |
|
2617
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
769 |
case 5: |
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
770 |
if (p->renew_keep_length == (bool)GB(p2, 0, 1)) |
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
771 |
return CMD_ERROR; |
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
772 |
|
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
773 |
if (flags & DC_EXEC) {
|
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
774 |
p->renew_keep_length = (bool)GB(p2, 0, 1); |
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
775 |
if (IsLocalPlayer()) {
|
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
776 |
InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train); |
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
777 |
} |
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
778 |
} |
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
779 |
break; |
|
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
780 |
|
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
781 |
} |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
782 |
return 0; |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
783 |
} |
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
784 |
|
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
785 |
/** Control the players: add, delete, etc. |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3393
diff
changeset
|
786 |
* @param tile unused |
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
787 |
* @param p1 various functionality |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
788 |
* - p1 = 0 - create a new player, Which player (network) it will be is in p2 |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
789 |
* - p1 = 1 - create a new AI player |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
790 |
* - p1 = 2 - delete a player. Player is identified by p2 |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
791 |
* - p1 = 3 - merge two companies together. Player to merge #1 with player #2. Identified by p2 |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
792 |
* @param p2 various functionality, dictated by p1 |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
793 |
* - p1 = 0 - ClientID of the newly created player |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
794 |
* - p1 = 2 - PlayerID of the that is getting deleted |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
795 |
* - p1 = 3 - #1 p2 = (bit 0-15) - player to merge (p2 & 0xFFFF) |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
796 |
* - #2 p2 = (bit 16-31) - player to be merged into ((p2>>16)&0xFFFF) |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
797 |
* @todo In the case of p1=0, create new player, the clientID of the new player is in parameter |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
798 |
* p2. This parameter is passed in at function DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND) |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
799 |
* on the server itself. First of all this is unbelievably ugly; second of all, well, |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
800 |
* it IS ugly! <b>Someone fix this up :)</b> So where to fix?@n |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
801 |
* @arg - network_server.c:838 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)@n |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
802 |
* @arg - network_client.c:536 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP) from where the map has been received |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
803 |
*/ |
|
3491
4c8427796c64
(svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents:
3393
diff
changeset
|
804 |
int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) |
| 0 | 805 |
{
|
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
806 |
if (flags & DC_EXEC) _current_player = OWNER_NONE; |
| 0 | 807 |
|
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
808 |
switch (p1) {
|
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
809 |
case 0: { /* Create a new player */
|
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
810 |
Player *p; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
811 |
PlayerID pid = p2; |
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
812 |
|
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
813 |
if (!(flags & DC_EXEC) || pid >= MAX_PLAYERS) return 0; |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
814 |
|
| 0 | 815 |
p = DoStartupNewPlayer(false); |
|
670
7c58dc46609c
(svn r1108) -Fix: [Network] Fixed problem around slow clients:
truelight
parents:
662
diff
changeset
|
816 |
|
|
7c58dc46609c
(svn r1108) -Fix: [Network] Fixed problem around slow clients:
truelight
parents:
662
diff
changeset
|
817 |
#ifdef ENABLE_NETWORK |
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
818 |
if (_networking && !_network_server && _local_player == OWNER_SPECTATOR) {
|
|
670
7c58dc46609c
(svn r1108) -Fix: [Network] Fixed problem around slow clients:
truelight
parents:
662
diff
changeset
|
819 |
/* In case we are a client joining a server... */ |
|
7c58dc46609c
(svn r1108) -Fix: [Network] Fixed problem around slow clients:
truelight
parents:
662
diff
changeset
|
820 |
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); |
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
821 |
} |
|
670
7c58dc46609c
(svn r1108) -Fix: [Network] Fixed problem around slow clients:
truelight
parents:
662
diff
changeset
|
822 |
#endif /* ENABLE_NETWORK */ |
|
7c58dc46609c
(svn r1108) -Fix: [Network] Fixed problem around slow clients:
truelight
parents:
662
diff
changeset
|
823 |
|
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
824 |
if (p != NULL) {
|
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
825 |
if (_local_player == OWNER_SPECTATOR && |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
826 |
(!_ai.network_client || _ai.network_playas == OWNER_SPECTATOR)) {
|
|
717
9530ebdc7eb0
(svn r1169) -Fix: [Network] [ 1087591 ] When you want to be a spectator, you now
truelight
parents:
690
diff
changeset
|
827 |
/* Check if we do not want to be a spectator in network */ |
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
828 |
if (!_networking || |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
829 |
(_network_server && !_network_dedicated) || |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
830 |
_network_playas != OWNER_SPECTATOR || |
|
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
831 |
_ai.network_client) {
|
|
2684
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
832 |
if (_ai.network_client) {
|
|
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
833 |
/* As ai-network-client, we have our own rulez (disable GUI and stuff) */ |
|
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
834 |
_ai.network_playas = p->index; |
|
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
835 |
_local_player = OWNER_SPECTATOR; |
|
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
836 |
if (_ai.network_playas != OWNER_SPECTATOR) {
|
|
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
837 |
/* If we didn't join the game as a spectator, activate the AI */ |
|
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
838 |
AI_StartNewAI(_ai.network_playas); |
|
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
839 |
} |
|
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
840 |
} else {
|
|
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
841 |
_local_player = p->index; |
|
8aba54c245cc
(svn r3226) -Fix: GPMI implementation had minor glitches
truelight
parents:
2682
diff
changeset
|
842 |
} |
|
717
9530ebdc7eb0
(svn r1169) -Fix: [Network] [ 1087591 ] When you want to be a spectator, you now
truelight
parents:
690
diff
changeset
|
843 |
MarkWholeScreenDirty(); |
|
9530ebdc7eb0
(svn r1169) -Fix: [Network] [ 1087591 ] When you want to be a spectator, you now
truelight
parents:
690
diff
changeset
|
844 |
} |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
845 |
} else if (p->index == _local_player) {
|
|
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
846 |
DoCommandP(0, (_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4, _patches.autorenew_money, NULL, CMD_REPLACE_VEHICLE); |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
847 |
} |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
848 |
#ifdef ENABLE_NETWORK |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
849 |
if (_network_server) {
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
850 |
/* XXX - UGLY! p2 (pid) is mis-used to fetch the client-id, done at |
|
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
851 |
* server-side in network_server.c:838, function |
|
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
852 |
* DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND) */ |
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
853 |
NetworkClientInfo *ci = &_network_client_info[pid]; |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
854 |
ci->client_playas = p->index + 1; |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
855 |
NetworkUpdateClientInfo(ci->client_index); |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
856 |
|
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
857 |
if (ci->client_playas != 0 && ci->client_playas <= MAX_PLAYERS) {
|
|
1787
79730785d7e7
(svn r2291) - Fix (regression): When a client joined it changed the server-player's name. Funny effect; but not desired. Thanks for pointing it out Tron. It needed a bit of hacking, but is not less of a hack than the one used before :)
Darkvater
parents:
1576
diff
changeset
|
858 |
PlayerID player_backup = _local_player; |
|
690
9f449a6b133e
(svn r1131) -Add: [Network] Autoclean_companies (set it with 'set autoclean_companies on/off').
truelight
parents:
688
diff
changeset
|
859 |
_network_player_info[p->index].months_empty = 0; |
|
9f449a6b133e
(svn r1131) -Add: [Network] Autoclean_companies (set it with 'set autoclean_companies on/off').
truelight
parents:
688
diff
changeset
|
860 |
|
|
1820
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
861 |
/* XXX - When a client joins, we automatically set its name to the |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
862 |
* player's name (for some reason). As it stands now only the server |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
863 |
* knows the client's name, so it needs to send out a "broadcast" to |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
864 |
* do this. To achieve this we send a network command. However, it |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
865 |
* uses _local_player to execute the command as. To prevent abuse |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
866 |
* (eg. only yourself can change your name/company), we 'cheat' by |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
867 |
* impersonation _local_player as the server. Not the best solution; |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
868 |
* but it works. |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
869 |
* TODO: Perhaps this could be improved by when the client is ready |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
870 |
* with joining to let it send itself the command, and not the server? |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
871 |
* For example in network_client.c:534? */ |
|
9b6458526480
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
tron
parents:
1812
diff
changeset
|
872 |
_cmd_text = ci->client_name; |
|
1787
79730785d7e7
(svn r2291) - Fix (regression): When a client joined it changed the server-player's name. Funny effect; but not desired. Thanks for pointing it out Tron. It needed a bit of hacking, but is not less of a hack than the one used before :)
Darkvater
parents:
1576
diff
changeset
|
873 |
_local_player = ci->client_playas - 1; |
|
79730785d7e7
(svn r2291) - Fix (regression): When a client joined it changed the server-player's name. Funny effect; but not desired. Thanks for pointing it out Tron. It needed a bit of hacking, but is not less of a hack than the one used before :)
Darkvater
parents:
1576
diff
changeset
|
874 |
NetworkSend_Command(0, 0, 0, CMD_CHANGE_PRESIDENT_NAME, NULL); |
|
79730785d7e7
(svn r2291) - Fix (regression): When a client joined it changed the server-player's name. Funny effect; but not desired. Thanks for pointing it out Tron. It needed a bit of hacking, but is not less of a hack than the one used before :)
Darkvater
parents:
1576
diff
changeset
|
875 |
_local_player = player_backup; |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
876 |
} |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
541
diff
changeset
|
877 |
} |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
878 |
} else if (_network_server) {
|
|
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
879 |
// Creating player failed, defer client to spectator |
|
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
880 |
/* XXX - UGLY! p2 (pid) is mis-used to fetch the client-id, done at |
|
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
881 |
* server-side in network_server.c:838, function |
|
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
882 |
* DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND) */ |
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
883 |
NetworkClientInfo *ci = &_network_client_info[pid]; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
884 |
ci->client_playas = OWNER_SPECTATOR; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
885 |
NetworkUpdateClientInfo(ci->client_index); |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
886 |
#endif /* ENABLE_NETWORK */ |
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
887 |
} |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
888 |
} break; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
889 |
|
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
890 |
case 1: /* Make a new AI player */ |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
891 |
if (!(flags & DC_EXEC)) return 0; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
892 |
|
| 0 | 893 |
DoStartupNewPlayer(true); |
894 |
break; |
|
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
895 |
|
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
896 |
case 2: { /* Delete a player */
|
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
897 |
Player *p; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
898 |
|
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
899 |
if (p2 >= MAX_PLAYERS) return CMD_ERROR; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
900 |
|
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
901 |
if (!(flags & DC_EXEC)) return 0; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
902 |
|
|
1962
51ee4f459268
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1901
diff
changeset
|
903 |
p = GetPlayer(p2); |
|
688
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
904 |
|
|
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
905 |
/* Only allow removal of HUMAN companies */ |
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
906 |
if (IS_HUMAN_PLAYER(p->index)) {
|
|
688
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
907 |
/* Delete any open window of the company */ |
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
908 |
DeletePlayerWindows(p->index); |
|
688
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
909 |
|
|
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
910 |
/* Show the bankrupt news */ |
|
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
911 |
SetDParam(0, p->name_1); |
|
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
912 |
SetDParam(1, p->name_2); |
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
913 |
AddNewsItem( (StringID)(p->index + 16*3), NEWS_FLAGS(NM_CALLBACK, 0, NT_COMPANY_INFO, DNC_BANKRUPCY),0,0); |
|
688
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
914 |
|
|
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
915 |
/* Remove the company */ |
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
916 |
ChangeOwnershipOfPlayerItems(p->index, OWNER_SPECTATOR); |
|
688
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
917 |
p->is_active = false; |
|
bcaa5256253d
(svn r1129) -Add: [Network] Added 'reset_company <company-id>'. If a company is
truelight
parents:
679
diff
changeset
|
918 |
} |
| 2848 | 919 |
RemoveAllEngineReplacementForPlayer(p); |
920 |
||
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
921 |
} break; |
| 0 | 922 |
|
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
923 |
case 3: { /* Merge a company (#1) into another company (#2), elimination company #1 */
|
|
2140
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2119
diff
changeset
|
924 |
PlayerID pid_old = GB(p2, 0, 16); |
|
d708eb80ab8b
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
tron
parents:
2119
diff
changeset
|
925 |
PlayerID pid_new = GB(p2, 16, 16); |
|
1796
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
926 |
|
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
927 |
if (pid_old >= MAX_PLAYERS || pid_new >= MAX_PLAYERS) return CMD_ERROR; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
928 |
|
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
929 |
if (!(flags & DC_EXEC)) return CMD_ERROR; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
930 |
|
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
931 |
ChangeOwnershipOfPlayerItems(pid_old, pid_new); |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
932 |
DeletePlayerStuff(pid_old); |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
933 |
} break; |
|
cae31916ae54
(svn r2300) - CodeChange: check the last number of commands, now only the refit ones remain, and some server-only commands.
Darkvater
parents:
1787
diff
changeset
|
934 |
default: return CMD_ERROR; |
| 0 | 935 |
} |
936 |
||
937 |
return 0; |
|
938 |
} |
|
939 |
||
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
940 |
static const StringID _endgame_perf_titles[] = {
|
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
941 |
STR_0213_BUSINESSMAN, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
942 |
STR_0213_BUSINESSMAN, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
943 |
STR_0213_BUSINESSMAN, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
944 |
STR_0213_BUSINESSMAN, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
945 |
STR_0213_BUSINESSMAN, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
946 |
STR_0214_ENTREPRENEUR, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
947 |
STR_0214_ENTREPRENEUR, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
948 |
STR_0215_INDUSTRIALIST, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
949 |
STR_0215_INDUSTRIALIST, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
950 |
STR_0216_CAPITALIST, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
951 |
STR_0216_CAPITALIST, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
952 |
STR_0217_MAGNATE, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
953 |
STR_0217_MAGNATE, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
954 |
STR_0218_MOGUL, |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
955 |
STR_0218_MOGUL, |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
956 |
STR_0219_TYCOON_OF_THE_CENTURY |
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
957 |
}; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
958 |
|
|
1016
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
959 |
StringID EndGameGetPerformanceTitleFromValue(uint value) |
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
960 |
{
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
961 |
value = minu(value / 64, lengthof(_endgame_perf_titles) - 1); |
|
2613
b008d366ed8a
(svn r3151) - Fix: showing the highscore might crash the game with an invalid string message in the case when a highscore file was used before certain strings were added.
Darkvater
parents:
2572
diff
changeset
|
962 |
|
|
b008d366ed8a
(svn r3151) - Fix: showing the highscore might crash the game with an invalid string message in the case when a highscore file was used before certain strings were added.
Darkvater
parents:
2572
diff
changeset
|
963 |
return _endgame_perf_titles[value]; |
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
964 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
965 |
|
|
1016
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
966 |
/* Return true if any cheat has been used, false otherwise */ |
|
1021
7d2009476253
(svn r1522) -Fix: warning players.c; forgot return type. Damn, makefile is too strict ;) (Thx Tron)
darkvater
parents:
1019
diff
changeset
|
967 |
static bool CheatHasBeenUsed(void) |
|
1016
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
968 |
{
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
969 |
const Cheat* cht = (Cheat*)&_cheats; |
|
1016
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
970 |
const Cheat* cht_last = &cht[sizeof(_cheats) / sizeof(Cheat)]; |
|
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
971 |
|
|
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
972 |
for (; cht != cht_last; cht++) {
|
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4023
diff
changeset
|
973 |
if (cht->been_used) return true; |
|
1016
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
974 |
} |
|
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
975 |
|
|
1019
6363b8a4273e
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
1017
diff
changeset
|
976 |
return false; |
|
1016
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
977 |
} |
|
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
978 |
|
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
979 |
/* Save the highscore for the player */ |
|
998
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
980 |
int8 SaveHighScoreValue(const Player *p) |
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
981 |
{
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
982 |
HighScore *hs = _highscore_table[_opt.diff_level]; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
983 |
uint i; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
984 |
uint16 score = p->old_economy[0].performance_history; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
985 |
|
|
1016
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
986 |
/* Exclude cheaters from the honour of being in the highscore table */ |
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
987 |
if (CheatHasBeenUsed()) return -1; |
|
1016
026b2de61647
(svn r1516) -Cheating players do not get their names added to the highscore table/file
darkvater
parents:
998
diff
changeset
|
988 |
|
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
989 |
for (i = 0; i < lengthof(_highscore_table[0]); i++) {
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
990 |
/* You are in the TOP5. Move all values one down and save us there */ |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
991 |
if (hs[i].score <= score) {
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
992 |
// move all elements one down starting from the replaced one |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
993 |
memmove(&hs[i + 1], &hs[i], sizeof(HighScore) * (lengthof(_highscore_table[0]) - i - 1)); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
994 |
SetDParam(0, p->president_name_1); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
995 |
SetDParam(1, p->president_name_2); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
996 |
SetDParam(2, p->name_1); |
|
1017
608592d4d7a6
(svn r1518) -Fix: server issue where some company names were wrong
darkvater
parents:
1016
diff
changeset
|
997 |
SetDParam(3, p->name_2); |
| 2987 | 998 |
GetString(hs[i].company, STR_HIGHSCORE_NAME); // get manager/company name string |
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
999 |
hs[i].score = score; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1000 |
hs[i].title = EndGameGetPerformanceTitleFromValue(score); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1001 |
return i; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1002 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1003 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1004 |
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1005 |
return -1; // too bad; we did not make it into the top5 |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1006 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1007 |
|
|
998
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1008 |
/* Sort all players given their performance */ |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1009 |
static int CDECL HighScoreSorter(const void *a, const void *b) |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1010 |
{
|
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1011 |
const Player *pa = *(const Player* const*)a; |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1012 |
const Player *pb = *(const Player* const*)b; |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1013 |
|
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1014 |
return pb->old_economy[0].performance_history - pa->old_economy[0].performance_history; |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1015 |
} |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1016 |
|
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1017 |
/* Save the highscores in a network game when it has ended */ |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1018 |
#define LAST_HS_ITEM lengthof(_highscore_table) - 1 |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1019 |
int8 SaveHighScoreValueNetwork(void) |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1020 |
{
|
|
2988
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1021 |
const Player* p; |
|
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1022 |
const Player* pl[MAX_PLAYERS]; |
|
998
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1023 |
size_t count = 0; |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1024 |
int8 player = -1; |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1025 |
|
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1026 |
/* Sort all active players with the highest score first */ |
|
2988
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1027 |
FOR_ALL_PLAYERS(p) if (p->is_active) pl[count++] = p; |
|
2992
d3248a561d0d
(svn r3568) - Fix: constantizing side-effect of qsort in r3563. Ugly? Yes. Makes MSVC happy? Yes.
Darkvater
parents:
2990
diff
changeset
|
1028 |
qsort((Player*)pl, count, sizeof(pl[0]), HighScoreSorter); |
|
998
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1029 |
|
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1030 |
{
|
|
2988
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1031 |
uint i; |
|
998
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1032 |
|
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1033 |
memset(_highscore_table[LAST_HS_ITEM], 0, sizeof(_highscore_table[0])); |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1034 |
|
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1035 |
/* Copy over Top5 companies */ |
|
2484
8e0c88a833fb
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
tron
parents:
2475
diff
changeset
|
1036 |
for (i = 0; i < lengthof(_highscore_table[LAST_HS_ITEM]) && i < count; i++) {
|
|
2988
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1037 |
HighScore* hs = &_highscore_table[LAST_HS_ITEM][i]; |
|
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1038 |
|
|
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1039 |
SetDParam(0, pl[i]->president_name_1); |
|
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1040 |
SetDParam(1, pl[i]->president_name_2); |
|
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1041 |
SetDParam(2, pl[i]->name_1); |
|
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1042 |
SetDParam(3, pl[i]->name_2); |
| 2987 | 1043 |
GetString(hs->company, STR_HIGHSCORE_NAME); // get manager/company name string |
|
2988
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1044 |
hs->score = pl[i]->old_economy[0].performance_history; |
|
998
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1045 |
hs->title = EndGameGetPerformanceTitleFromValue(hs->score); |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1046 |
|
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1047 |
// get the ranking of the local player |
|
2988
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1048 |
if (pl[i]->index == _local_player) player = i; |
|
998
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1049 |
} |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1050 |
} |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1051 |
|
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1052 |
/* Add top5 players to highscore table */ |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1053 |
return player; |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1054 |
} |
|
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1055 |
|
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1056 |
/* Save HighScore table to file */ |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1057 |
void SaveToHighScore(void) |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1058 |
{
|
|
2613
b008d366ed8a
(svn r3151) - Fix: showing the highscore might crash the game with an invalid string message in the case when a highscore file was used before certain strings were added.
Darkvater
parents:
2572
diff
changeset
|
1059 |
FILE *fp = fopen(_highscore_file, "wb"); |
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1060 |
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1061 |
if (fp != NULL) {
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1062 |
uint i; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1063 |
HighScore *hs; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1064 |
|
|
998
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1065 |
for (i = 0; i < LAST_HS_ITEM; i++) { // don't save network highscores
|
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1066 |
for (hs = _highscore_table[i]; hs != endof(_highscore_table[i]); hs++) {
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1067 |
/* First character is a command character, so strlen will fail on that */ |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1068 |
byte length = min(sizeof(hs->company), (hs->company[0] == '\0') ? 0 : strlen(&hs->company[1]) + 1); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1069 |
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1070 |
fwrite(&length, sizeof(length), 1, fp); // write away string length |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1071 |
fwrite(hs->company, length, 1, fp); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1072 |
fwrite(&hs->score, sizeof(hs->score), 1, fp); |
|
2613
b008d366ed8a
(svn r3151) - Fix: showing the highscore might crash the game with an invalid string message in the case when a highscore file was used before certain strings were added.
Darkvater
parents:
2572
diff
changeset
|
1073 |
fwrite("", 2, 1, fp); /* XXX - placeholder for hs->title, not saved anymore; compatibility */
|
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1074 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1075 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1076 |
fclose(fp); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1077 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1078 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1079 |
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1080 |
/* Initialize the highscore table to 0 and if any file exists, load in values */ |
|
1019
6363b8a4273e
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
1017
diff
changeset
|
1081 |
void LoadFromHighScore(void) |
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1082 |
{
|
|
2613
b008d366ed8a
(svn r3151) - Fix: showing the highscore might crash the game with an invalid string message in the case when a highscore file was used before certain strings were added.
Darkvater
parents:
2572
diff
changeset
|
1083 |
FILE *fp = fopen(_highscore_file, "rb"); |
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1084 |
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1085 |
memset(_highscore_table, 0, sizeof(_highscore_table)); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1086 |
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1087 |
if (fp != NULL) {
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1088 |
uint i; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1089 |
HighScore *hs; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1090 |
|
|
998
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1091 |
for (i = 0; i < LAST_HS_ITEM; i++) { // don't load network highscores
|
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1092 |
for (hs = _highscore_table[i]; hs != endof(_highscore_table[i]); hs++) {
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1093 |
byte length; |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1094 |
fread(&length, sizeof(length), 1, fp); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1095 |
|
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1096 |
fread(hs->company, 1, length, fp); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1097 |
fread(&hs->score, sizeof(hs->score), 1, fp); |
|
2613
b008d366ed8a
(svn r3151) - Fix: showing the highscore might crash the game with an invalid string message in the case when a highscore file was used before certain strings were added.
Darkvater
parents:
2572
diff
changeset
|
1098 |
fseek(fp, 2, SEEK_CUR); /* XXX - placeholder for hs->title, not saved anymore; compatibility */ |
|
b008d366ed8a
(svn r3151) - Fix: showing the highscore might crash the game with an invalid string message in the case when a highscore file was used before certain strings were added.
Darkvater
parents:
2572
diff
changeset
|
1099 |
hs->title = EndGameGetPerformanceTitleFromValue(hs->score); |
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1100 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1101 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1102 |
fclose(fp); |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1103 |
} |
|
1019
6363b8a4273e
(svn r1520) Trim 134 (!) lines with trailing whitespace ):
tron
parents:
1017
diff
changeset
|
1104 |
|
|
998
d9dc257b8949
(svn r1496) -Fix: highscore no longer crashes in network games with a dedicated server. At the end of the game (can only be set by the server) the highscore is shown for the top5 companies of that game
darkvater
parents:
983
diff
changeset
|
1105 |
/* Initialize end of game variable (when to show highscore chart) */ |
|
4285
72b3f7d6c891
(svn r5915) -Cleanup: some variables were named *_date while they were only holding years; rename these variables to match this.
rubidium
parents:
4261
diff
changeset
|
1106 |
_patches.ending_year = 2051; |
|
983
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1107 |
} |
|
1be852dcdd4c
(svn r1479) -Added highscore chart (accessible from the difficulty window) with top5 companies for a given difficulty (select the difficulty in the menu)
darkvater
parents:
717
diff
changeset
|
1108 |
|
| 0 | 1109 |
// Save/load of players |
|
1881
023a134a4b12
(svn r2387) - CodeChange: made the saveload code more readable and also removed the 'byte' saveload arrays which means you can save an array of more than 255 elements, or bigger structs than 255 bytes. This doesn't yet solve the problem that a chunk can be a maximum of 16384 big.
Darkvater
parents:
1834
diff
changeset
|
1110 |
static const SaveLoad _player_desc[] = {
|
| 0 | 1111 |
SLE_VAR(Player,name_2, SLE_UINT32), |
1112 |
SLE_VAR(Player,name_1, SLE_STRINGID), |
|
1113 |
||
1114 |
SLE_VAR(Player,president_name_1,SLE_UINT16), |
|
1115 |
SLE_VAR(Player,president_name_2,SLE_UINT32), |
|
1116 |
||
1117 |
SLE_VAR(Player,face, SLE_UINT32), |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
1118 |
|
| 0 | 1119 |
// money was changed to a 64 bit field in savegame version 1. |
1120 |
SLE_CONDVAR(Player,money64, SLE_VAR_I64 | SLE_FILE_I32, 0, 0), |
|
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1121 |
SLE_CONDVAR(Player,money64, SLE_INT64, 1, SL_MAX_VERSION), |
| 0 | 1122 |
|
1123 |
SLE_VAR(Player,current_loan, SLE_INT32), |
|
1124 |
||
1125 |
SLE_VAR(Player,player_color, SLE_UINT8), |
|
1126 |
SLE_VAR(Player,player_money_fraction,SLE_UINT8), |
|
|
2147
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2140
diff
changeset
|
1127 |
SLE_VAR(Player,avail_railtypes, SLE_UINT8), |
| 0 | 1128 |
SLE_VAR(Player,block_preview, SLE_UINT8), |
1129 |
||
1130 |
SLE_VAR(Player,cargo_types, SLE_UINT16), |
|
|
1174
27e386195965
(svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change
tron
parents:
1093
diff
changeset
|
1131 |
SLE_CONDVAR(Player, location_of_house, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1132 |
SLE_CONDVAR(Player, location_of_house, SLE_UINT32, 6, SL_MAX_VERSION), |
|
1174
27e386195965
(svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change
tron
parents:
1093
diff
changeset
|
1133 |
SLE_CONDVAR(Player, last_build_coordinate, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1134 |
SLE_CONDVAR(Player, last_build_coordinate, SLE_UINT32, 6, SL_MAX_VERSION), |
| 0 | 1135 |
SLE_VAR(Player,inaugurated_year,SLE_UINT8), |
1136 |
||
1137 |
SLE_ARR(Player,share_owners, SLE_UINT8, 4), |
|
1138 |
||
1139 |
SLE_VAR(Player,num_valid_stat_ent,SLE_UINT8), |
|
1140 |
||
1141 |
SLE_VAR(Player,quarters_of_bankrupcy,SLE_UINT8), |
|
1142 |
SLE_VAR(Player,bankrupt_asked, SLE_UINT8), |
|
1143 |
SLE_VAR(Player,bankrupt_timeout,SLE_INT16), |
|
1144 |
SLE_VAR(Player,bankrupt_value, SLE_INT32), |
|
1145 |
||
1146 |
// yearly expenses was changed to 64-bit in savegame version 2. |
|
1147 |
SLE_CONDARR(Player,yearly_expenses, SLE_FILE_I32|SLE_VAR_I64, 3*13, 0, 1), |
|
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1148 |
SLE_CONDARR(Player,yearly_expenses, SLE_INT64, 3*13, 2, SL_MAX_VERSION), |
| 0 | 1149 |
|
|
3873
5ddd36fbebff
(svn r4915) - Fix: SLE_UINT8 replaced by SLE_BOOL for bool variables (found by Celestar)
KUDr
parents:
3491
diff
changeset
|
1150 |
SLE_CONDVAR(Player,is_ai, SLE_BOOL, 2, SL_MAX_VERSION), |
|
5ddd36fbebff
(svn r4915) - Fix: SLE_UINT8 replaced by SLE_BOOL for bool variables (found by Celestar)
KUDr
parents:
3491
diff
changeset
|
1151 |
SLE_CONDVAR(Player,is_active, SLE_BOOL, 4, SL_MAX_VERSION), |
| 0 | 1152 |
|
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
1153 |
// Engine renewal settings |
|
3222
8bfed4267cba
(svn r3895) - Add proper SLE(G)_CONDNULL macros for the empty space reservation in savegames and update where used
Darkvater
parents:
3047
diff
changeset
|
1154 |
SLE_CONDNULL(512, 16, 18), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1155 |
SLE_CONDREF(Player,engine_renew_list, REF_ENGINE_RENEWS, 19, SL_MAX_VERSION), |
|
3873
5ddd36fbebff
(svn r4915) - Fix: SLE_UINT8 replaced by SLE_BOOL for bool variables (found by Celestar)
KUDr
parents:
3491
diff
changeset
|
1156 |
SLE_CONDVAR(Player,engine_renew, SLE_BOOL, 16, SL_MAX_VERSION), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1157 |
SLE_CONDVAR(Player,engine_renew_months, SLE_INT16, 16, SL_MAX_VERSION), |
|
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1158 |
SLE_CONDVAR(Player,engine_renew_money, SLE_UINT32, 16, SL_MAX_VERSION), |
|
3873
5ddd36fbebff
(svn r4915) - Fix: SLE_UINT8 replaced by SLE_BOOL for bool variables (found by Celestar)
KUDr
parents:
3491
diff
changeset
|
1159 |
SLE_CONDVAR(Player,renew_keep_length, SLE_BOOL, 2, SL_MAX_VERSION), // added with 16.1, but was blank since 2 |
|
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2204
diff
changeset
|
1160 |
|
|
2617
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2616
diff
changeset
|
1161 |
// reserve extra space in savegame here. (currently 63 bytes) |
|
3222
8bfed4267cba
(svn r3895) - Add proper SLE(G)_CONDNULL macros for the empty space reservation in savegames and update where used
Darkvater
parents:
3047
diff
changeset
|
1162 |
SLE_CONDNULL(63, 2, SL_MAX_VERSION), |
| 0 | 1163 |
|
1164 |
SLE_END() |
|
1165 |
}; |
|
1166 |
||
|
1881
023a134a4b12
(svn r2387) - CodeChange: made the saveload code more readable and also removed the 'byte' saveload arrays which means you can save an array of more than 255 elements, or bigger structs than 255 bytes. This doesn't yet solve the problem that a chunk can be a maximum of 16384 big.
Darkvater
parents:
1834
diff
changeset
|
1167 |
static const SaveLoad _player_economy_desc[] = {
|
| 0 | 1168 |
// these were changed to 64-bit in savegame format 2 |
1169 |
SLE_CONDVAR(PlayerEconomyEntry,income, SLE_INT32, 0, 1), |
|
1170 |
SLE_CONDVAR(PlayerEconomyEntry,expenses, SLE_INT32, 0, 1), |
|
|
2170
b8a5a7dc0cd2
(svn r2684) Correctly save and load company_value, it's 64 bits wide, not 32 bits
tron
parents:
2163
diff
changeset
|
1171 |
SLE_CONDVAR(PlayerEconomyEntry,company_value, SLE_FILE_I32 | SLE_VAR_I64, 0, 1), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1172 |
SLE_CONDVAR(PlayerEconomyEntry,income, SLE_FILE_I64 | SLE_VAR_I32, 2, SL_MAX_VERSION), |
|
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1173 |
SLE_CONDVAR(PlayerEconomyEntry,expenses,SLE_FILE_I64 | SLE_VAR_I32, 2, SL_MAX_VERSION), |
|
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1174 |
SLE_CONDVAR(PlayerEconomyEntry,company_value, SLE_INT64, 2, SL_MAX_VERSION), |
| 0 | 1175 |
|
1176 |
SLE_VAR(PlayerEconomyEntry,delivered_cargo, SLE_INT32), |
|
1177 |
SLE_VAR(PlayerEconomyEntry,performance_history, SLE_INT32), |
|
|
201
c40d343115f8
(svn r202) -Codechange: I missed some files with trailing spaces.. this should be
truelight
parents:
165
diff
changeset
|
1178 |
|
| 0 | 1179 |
SLE_END() |
1180 |
}; |
|
1181 |
||
|
1881
023a134a4b12
(svn r2387) - CodeChange: made the saveload code more readable and also removed the 'byte' saveload arrays which means you can save an array of more than 255 elements, or bigger structs than 255 bytes. This doesn't yet solve the problem that a chunk can be a maximum of 16384 big.
Darkvater
parents:
1834
diff
changeset
|
1182 |
static const SaveLoad _player_ai_desc[] = {
|
| 0 | 1183 |
SLE_VAR(PlayerAI,state, SLE_UINT8), |
1184 |
SLE_VAR(PlayerAI,tick, SLE_UINT8), |
|
|
1576
a066e33fa297
(svn r2080) - Fix: [OldAI] p->ai.state_counter was uint16 but could hold a tile index, therefore overflowing - changed that to uint32 and bumped the savegame revision to 32. It *MIGHT* close bug 1151374 - it certainly caused AI to stop building anything sometimes.
pasky
parents:
1402
diff
changeset
|
1185 |
SLE_CONDVAR(PlayerAI,state_counter, SLE_FILE_U16 | SLE_VAR_U32, 0, 12), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1186 |
SLE_CONDVAR(PlayerAI,state_counter, SLE_UINT32, 13, SL_MAX_VERSION), |
| 0 | 1187 |
SLE_VAR(PlayerAI,timeout_counter, SLE_UINT16), |
1188 |
||
1189 |
SLE_VAR(PlayerAI,state_mode, SLE_UINT8), |
|
1190 |
SLE_VAR(PlayerAI,banned_tile_count, SLE_UINT8), |
|
1191 |
SLE_VAR(PlayerAI,railtype_to_use, SLE_UINT8), |
|
1192 |
||
1193 |
SLE_VAR(PlayerAI,cargo_type, SLE_UINT8), |
|
1194 |
SLE_VAR(PlayerAI,num_wagons, SLE_UINT8), |
|
1195 |
SLE_VAR(PlayerAI,build_kind, SLE_UINT8), |
|
1196 |
SLE_VAR(PlayerAI,num_build_rec, SLE_UINT8), |
|
1197 |
SLE_VAR(PlayerAI,num_loco_to_build, SLE_UINT8), |
|
1198 |
SLE_VAR(PlayerAI,num_want_fullload, SLE_UINT8), |
|
1199 |
||
1200 |
SLE_VAR(PlayerAI,route_type_mask, SLE_UINT8), |
|
1201 |
||
|
1174
27e386195965
(svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change
tron
parents:
1093
diff
changeset
|
1202 |
SLE_CONDVAR(PlayerAI, start_tile_a, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1203 |
SLE_CONDVAR(PlayerAI, start_tile_a, SLE_UINT32, 6, SL_MAX_VERSION), |
|
1174
27e386195965
(svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change
tron
parents:
1093
diff
changeset
|
1204 |
SLE_CONDVAR(PlayerAI, cur_tile_a, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1205 |
SLE_CONDVAR(PlayerAI, cur_tile_a, SLE_UINT32, 6, SL_MAX_VERSION), |
| 0 | 1206 |
SLE_VAR(PlayerAI,start_dir_a, SLE_UINT8), |
1207 |
SLE_VAR(PlayerAI,cur_dir_a, SLE_UINT8), |
|
1208 |
||
|
1174
27e386195965
(svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change
tron
parents:
1093
diff
changeset
|
1209 |
SLE_CONDVAR(PlayerAI, start_tile_b, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1210 |
SLE_CONDVAR(PlayerAI, start_tile_b, SLE_UINT32, 6, SL_MAX_VERSION), |
|
1174
27e386195965
(svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change
tron
parents:
1093
diff
changeset
|
1211 |
SLE_CONDVAR(PlayerAI, cur_tile_b, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1212 |
SLE_CONDVAR(PlayerAI, cur_tile_b, SLE_UINT32, 6, SL_MAX_VERSION), |
| 0 | 1213 |
SLE_VAR(PlayerAI,start_dir_b, SLE_UINT8), |
1214 |
SLE_VAR(PlayerAI,cur_dir_b, SLE_UINT8), |
|
1215 |
||
1216 |
SLE_REF(PlayerAI,cur_veh, REF_VEHICLE), |
|
1217 |
||
1218 |
SLE_ARR(PlayerAI,wagon_list, SLE_UINT16, 9), |
|
1219 |
SLE_ARR(PlayerAI,order_list_blocks, SLE_UINT8, 20), |
|
1220 |
SLE_ARR(PlayerAI,banned_tiles, SLE_UINT16, 16), |
|
1221 |
||
|
3222
8bfed4267cba
(svn r3895) - Add proper SLE(G)_CONDNULL macros for the empty space reservation in savegames and update where used
Darkvater
parents:
3047
diff
changeset
|
1222 |
SLE_CONDNULL(64, 2, SL_MAX_VERSION), |
| 0 | 1223 |
SLE_END() |
1224 |
}; |
|
1225 |
||
|
1881
023a134a4b12
(svn r2387) - CodeChange: made the saveload code more readable and also removed the 'byte' saveload arrays which means you can save an array of more than 255 elements, or bigger structs than 255 bytes. This doesn't yet solve the problem that a chunk can be a maximum of 16384 big.
Darkvater
parents:
1834
diff
changeset
|
1226 |
static const SaveLoad _player_ai_build_rec_desc[] = {
|
|
1174
27e386195965
(svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change
tron
parents:
1093
diff
changeset
|
1227 |
SLE_CONDVAR(AiBuildRec,spec_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1228 |
SLE_CONDVAR(AiBuildRec,spec_tile, SLE_UINT32, 6, SL_MAX_VERSION), |
|
1174
27e386195965
(svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change
tron
parents:
1093
diff
changeset
|
1229 |
SLE_CONDVAR(AiBuildRec,use_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), |
|
3047
acae37f12efb
(svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION
Darkvater
parents:
2992
diff
changeset
|
1230 |
SLE_CONDVAR(AiBuildRec,use_tile, SLE_UINT32, 6, SL_MAX_VERSION), |
| 0 | 1231 |
SLE_VAR(AiBuildRec,rand_rng, SLE_UINT8), |
1232 |
SLE_VAR(AiBuildRec,cur_building_rule,SLE_UINT8), |
|
1233 |
SLE_VAR(AiBuildRec,unk6, SLE_UINT8), |
|
1234 |
SLE_VAR(AiBuildRec,unk7, SLE_UINT8), |
|
1235 |
SLE_VAR(AiBuildRec,buildcmd_a, SLE_UINT8), |
|
1236 |
SLE_VAR(AiBuildRec,buildcmd_b, SLE_UINT8), |
|
1237 |
SLE_VAR(AiBuildRec,direction, SLE_UINT8), |
|
1238 |
SLE_VAR(AiBuildRec,cargo, SLE_UINT8), |
|
1239 |
SLE_END() |
|
1240 |
}; |
|
1241 |
||
| 2952 | 1242 |
static void SaveLoad_PLYR(Player* p) |
1243 |
{
|
|
| 0 | 1244 |
int i; |
1245 |
||
1246 |
SlObject(p, _player_desc); |
|
1247 |
||
1248 |
// Write AI? |
|
1249 |
if (!IS_HUMAN_PLAYER(p->index)) {
|
|
1250 |
SlObject(&p->ai, _player_ai_desc); |
|
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
1251 |
for (i = 0; i != p->ai.num_build_rec; i++) {
|
| 0 | 1252 |
SlObject(&p->ai.src + i, _player_ai_build_rec_desc); |
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3873
diff
changeset
|
1253 |
} |
| 0 | 1254 |
} |
1255 |
||
1256 |
// Write economy |
|
1257 |
SlObject(&p->cur_economy, _player_economy_desc); |
|
1258 |
||
1259 |
// Write old economy entries. |
|
|
2988
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1260 |
for (i = 0; i < p->num_valid_stat_ent; i++) {
|
|
032feb8d9d8a
(svn r3563) Simplify the code for calculating the highscore table in network games and saving of old ecenomy data
tron
parents:
2987
diff
changeset
|
1261 |
SlObject(&p->old_economy[i], _player_economy_desc); |
| 0 | 1262 |
} |
1263 |
} |
|
1264 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1021
diff
changeset
|
1265 |
static void Save_PLYR(void) |
| 0 | 1266 |
{
|
1267 |
Player *p; |
|
1268 |
FOR_ALL_PLAYERS(p) {
|
|
1269 |
if (p->is_active) {
|
|
1270 |
SlSetArrayIndex(p->index); |
|
1271 |
SlAutolength((AutolengthProc*)SaveLoad_PLYR, p); |
|
1272 |
} |
|
1273 |
} |
|
1274 |
} |
|
1275 |
||
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1021
diff
changeset
|
1276 |
static void Load_PLYR(void) |
| 0 | 1277 |
{
|
1278 |
int index; |
|
1279 |
while ((index = SlIterateArray()) != -1) {
|
|
|
1962
51ee4f459268
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1901
diff
changeset
|
1280 |
Player *p = GetPlayer(index); |
| 0 | 1281 |
SaveLoad_PLYR(p); |
1282 |
_player_colors[index] = p->player_color; |
|
1283 |
UpdatePlayerMoney32(p); |
|
|
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
1284 |
|
|
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
1285 |
/* This is needed so an AI is attached to a loaded AI */ |
|
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
1286 |
if (p->is_ai && (!_networking || _network_server) && _ai.enabled) |
|
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2381
diff
changeset
|
1287 |
AI_StartNewAI(p->index); |
| 0 | 1288 |
} |
1289 |
} |
|
1290 |
||
1291 |
const ChunkHandler _player_chunk_handlers[] = {
|
|
1292 |
{ 'PLYR', Save_PLYR, Load_PLYR, CH_ARRAY | CH_LAST},
|
|
1293 |
}; |