author | Darkvater |
Sat, 09 Dec 2006 10:57:05 +0000 | |
changeset 5297 | 79c1f20edadc |
parent 5296 | 6a4aaa66eed3 |
child 5313 | ea491c0b40f1 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
0 | 3 |
#include "stdafx.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:
1314
diff
changeset
|
4 |
#include "string.h" |
507
8aa8100b0b22
(svn r815) Include strings.h only in the files which need it.
tron
parents:
497
diff
changeset
|
5 |
#include "table/strings.h" |
1299
0a6510cc889b
(svn r1803) Move debugging stuff into files of it's own
tron
parents:
1296
diff
changeset
|
6 |
#include "debug.h" |
2171
008122046f7f
(svn r2685) -Codechange: Split the music/sound/video drivers into separate files and move them into subfolders.
tron
parents:
2163
diff
changeset
|
7 |
#include "driver.h" |
2162
c1ded3bd3d0c
(svn r2672) Move saving/loading related declarations to saveload.h
tron
parents:
2147
diff
changeset
|
8 |
#include "saveload.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:
1301
diff
changeset
|
9 |
#include "strings.h" |
679
e959706a3e4d
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
659
diff
changeset
|
10 |
#include "map.h" |
1209
a1ac96655b79
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
tron
parents:
1199
diff
changeset
|
11 |
#include "tile.h" |
3144
426b825578f9
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
3121
diff
changeset
|
12 |
#include "void_map.h" |
0 | 13 |
|
14 |
#define VARDEF |
|
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1885
diff
changeset
|
15 |
#include "openttd.h" |
3367 | 16 |
#include "bridge_map.h" |
2163
637ec3c361f5
(svn r2673) Include functions.h directly, not globally via openttd.h
tron
parents:
2162
diff
changeset
|
17 |
#include "functions.h" |
1496
3d0b86f5dcb8
(svn r2000) Split the sound system into backend (mixer.[ch]) and frontend (sound.[ch])
tron
parents:
1482
diff
changeset
|
18 |
#include "mixer.h" |
1349
07514c2cc6d1
(svn r1853) Move spritecache function declarations into a header of their own and use SpriteID as parameter type where appropriate
tron
parents:
1329
diff
changeset
|
19 |
#include "spritecache.h" |
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4880
diff
changeset
|
20 |
#include "strings.h" |
0 | 21 |
#include "gfx.h" |
2340
0a9f3eeccb96
(svn r2866) Move all functions and tables which aren't directly involved in managing the sprite heap to a new file gfxinit.c.
tron
parents:
2322
diff
changeset
|
22 |
#include "gfxinit.h" |
0 | 23 |
#include "gui.h" |
24 |
#include "station.h" |
|
3367 | 25 |
#include "station_map.h" |
3558 | 26 |
#include "town_map.h" |
3367 | 27 |
#include "tunnel_map.h" |
0 | 28 |
#include "vehicle.h" |
29 |
#include "viewport.h" |
|
30 |
#include "window.h" |
|
31 |
#include "player.h" |
|
32 |
#include "command.h" |
|
33 |
#include "town.h" |
|
34 |
#include "industry.h" |
|
35 |
#include "news.h" |
|
36 |
#include "engine.h" |
|
37 |
#include "sound.h" |
|
38 |
#include "economy.h" |
|
39 |
#include "fileio.h" |
|
40 |
#include "hal.h" |
|
41 |
#include "airport.h" |
|
126 | 42 |
#include "console.h" |
430 | 43 |
#include "screenshot.h" |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
44 |
#include "network.h" |
988
2482369a61ff
(svn r1486) -Codechange: moved all 'signs' stuff to signs.c/h and prepared it for
truelight
parents:
983
diff
changeset
|
45 |
#include "signs.h" |
1313
bba6afb8a995
(svn r1817) -Codechange: Moved depot-functions to depot.c
truelight
parents:
1310
diff
changeset
|
46 |
#include "depot.h" |
1542
2ca6d1624e6d
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1501
diff
changeset
|
47 |
#include "waypoint.h" |
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2383
diff
changeset
|
48 |
#include "ai/ai.h" |
2855
950b5a56f9d5
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2848
diff
changeset
|
49 |
#include "train.h" |
3900
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3891
diff
changeset
|
50 |
#include "yapf/yapf.h" |
3889
cc4a8556c19d
(svn r4945) Fix (r3726): make -t command line option (set starting date/year) work again
rubidium
parents:
3765
diff
changeset
|
51 |
#include "settings.h" |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
52 |
#include "genworld.h" |
4261
2ec8f5a9747b
(svn r5887) -Cleanup: move date related functions, defines and variables to date.[ch]
rubidium
parents:
4260
diff
changeset
|
53 |
#include "date.h" |
4328
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
54 |
#include "clear_map.h" |
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5024
diff
changeset
|
55 |
#include "fontcache.h" |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
56 |
#include "newgrf_config.h" |
0 | 57 |
|
58 |
#include <stdarg.h> |
|
59 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
60 |
void CallLandscapeTick(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
61 |
void IncreaseDate(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
62 |
void DoPaletteAnimations(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
63 |
void MusicLoop(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
64 |
void ResetMusic(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
65 |
void InitializeStations(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
66 |
void DeleteAllPlayerStations(void); |
0 | 67 |
|
68 |
extern void SetDifficultyLevel(int mode, GameOptions *gm_opt); |
|
69 |
extern void DoStartupNewPlayer(bool is_ai); |
|
70 |
extern void ShowOSErrorBox(const char *buf); |
|
71 |
||
1436 | 72 |
/* TODO: usrerror() for errors which are not of an internal nature but |
73 |
* caused by the user, i.e. missing files or fatal configuration errors. |
|
74 |
* Post-0.4.0 since Celestar doesn't want this in SVN before. --pasky */ |
|
75 |
||
4171 | 76 |
void CDECL error(const char *s, ...) |
2639 | 77 |
{ |
0 | 78 |
va_list va; |
79 |
char buf[512]; |
|
2639 | 80 |
|
0 | 81 |
va_start(va, s); |
5170
56c12a62af49
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
82 |
vsnprintf(buf, lengthof(buf), s, va); |
0 | 83 |
va_end(va); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
84 |
|
0 | 85 |
ShowOSErrorBox(buf); |
2639 | 86 |
if (_video_driver != NULL) _video_driver->stop(); |
0 | 87 |
|
88 |
assert(0); |
|
89 |
exit(1); |
|
90 |
} |
|
91 |
||
92 |
void CDECL ShowInfoF(const char *str, ...) |
|
93 |
{ |
|
94 |
va_list va; |
|
95 |
char buf[1024]; |
|
96 |
va_start(va, str); |
|
5170
56c12a62af49
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
97 |
vsnprintf(buf, lengthof(buf), str, va); |
0 | 98 |
va_end(va); |
99 |
ShowInfo(buf); |
|
100 |
} |
|
101 |
||
102 |
||
1310
85cde2193afc
(svn r1814) Let ReadFileToMem() return void* (instead of byte*) because we don't know what the caller wants to do with the data
tron
parents:
1309
diff
changeset
|
103 |
void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize) |
0 | 104 |
{ |
105 |
FILE *in; |
|
1105 | 106 |
byte *mem; |
0 | 107 |
size_t len; |
108 |
||
109 |
in = fopen(filename, "rb"); |
|
2639 | 110 |
if (in == NULL) return NULL; |
0 | 111 |
|
112 |
fseek(in, 0, SEEK_END); |
|
113 |
len = ftell(in); |
|
114 |
fseek(in, 0, SEEK_SET); |
|
1105 | 115 |
if (len > maxsize || (mem = malloc(len + 1)) == NULL) { |
0 | 116 |
fclose(in); |
117 |
return NULL; |
|
118 |
} |
|
1105 | 119 |
mem[len] = 0; |
0 | 120 |
if (fread(mem, len, 1, in) != 1) { |
121 |
fclose(in); |
|
122 |
free(mem); |
|
123 |
return NULL; |
|
124 |
} |
|
125 |
fclose(in); |
|
126 |
||
127 |
*lenp = len; |
|
128 |
return mem; |
|
129 |
} |
|
130 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
131 |
static void showhelp(void) |
0 | 132 |
{ |
4840
176bc2a66322
(svn r6766) -Codechange: Move _openttd_revision[] into the functions that use it instead of global
Darkvater
parents:
4830
diff
changeset
|
133 |
extern const char _openttd_revision[]; |
0 | 134 |
char buf[4096], *p; |
135 |
||
5170
56c12a62af49
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
136 |
p = buf; |
2831
510c08cd43d2
(svn r3379) -Fix: protect showhelp against any possible overflow
truelight
parents:
2828
diff
changeset
|
137 |
|
5170
56c12a62af49
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
138 |
p += snprintf(p, lengthof(buf), "OpenTTD %s\n", _openttd_revision); |
56c12a62af49
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
139 |
p = strecpy(p, |
2831
510c08cd43d2
(svn r3379) -Fix: protect showhelp against any possible overflow
truelight
parents:
2828
diff
changeset
|
140 |
"\n" |
510c08cd43d2
(svn r3379) -Fix: protect showhelp against any possible overflow
truelight
parents:
2828
diff
changeset
|
141 |
"\n" |
0 | 142 |
"Command line options:\n" |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
143 |
" -v drv = Set video driver (see below)\n" |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
144 |
" -s drv = Set sound driver (see below)\n" |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
145 |
" -m drv = Set music driver (see below)\n" |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
146 |
" -r res = Set resolution (for instance 800x600)\n" |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
147 |
" -h = Display this help text\n" |
4285
72b3f7d6c891
(svn r5915) -Cleanup: some variables were named *_date while they were only holding years; rename these variables to match this.
rubidium
parents:
4277
diff
changeset
|
148 |
" -t year = Set starting year\n" |
1440
2eb4dd1e0465
(svn r1944) Make --help output for -d at least somewhat useful.
pasky
parents:
1436
diff
changeset
|
149 |
" -d [[fac=]lvl[,...]]= Debug mode\n" |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
150 |
" -e = Start Editor\n" |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
151 |
" -g [savegame] = Start new/save game immediately\n" |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
152 |
" -G seed = Set random seed\n" |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
153 |
" -n [ip#player:port] = Start networkgame\n" |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
154 |
" -D = Start dedicated server\n" |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
155 |
#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32) |
704
a526dc96fbfc
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
156 |
" -f = Fork into the background (dedicated only)\n" |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
157 |
#endif |
2831
510c08cd43d2
(svn r3379) -Fix: protect showhelp against any possible overflow
truelight
parents:
2828
diff
changeset
|
158 |
" -i = Force to use the DOS palette\n" |
510c08cd43d2
(svn r3379) -Fix: protect showhelp against any possible overflow
truelight
parents:
2828
diff
changeset
|
159 |
" (use this if you see a lot of pink)\n" |
510c08cd43d2
(svn r3379) -Fix: protect showhelp against any possible overflow
truelight
parents:
2828
diff
changeset
|
160 |
" -c config_file = Use 'config_file' instead of 'openttd.cfg'\n" |
5170
56c12a62af49
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
161 |
"\n", |
56c12a62af49
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
162 |
lastof(buf) |
0 | 163 |
); |
164 |
||
5170
56c12a62af49
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
165 |
p = GetDriverList(p, lastof(buf)); |
0 | 166 |
|
167 |
ShowInfo(buf); |
|
168 |
} |
|
169 |
||
170 |
||
171 |
typedef struct { |
|
172 |
char *opt; |
|
173 |
int numleft; |
|
174 |
char **argv; |
|
175 |
const char *options; |
|
176 |
char *cont; |
|
177 |
} MyGetOptData; |
|
178 |
||
179 |
static void MyGetOptInit(MyGetOptData *md, int argc, char **argv, const char *options) |
|
180 |
{ |
|
181 |
md->cont = NULL; |
|
182 |
md->numleft = argc; |
|
183 |
md->argv = argv; |
|
184 |
md->options = options; |
|
185 |
} |
|
186 |
||
187 |
static int MyGetOpt(MyGetOptData *md) |
|
188 |
{ |
|
189 |
char *s,*r,*t; |
|
190 |
||
2639 | 191 |
s = md->cont; |
192 |
if (s != NULL) |
|
0 | 193 |
goto md_continue_here; |
194 |
||
2639 | 195 |
for (;;) { |
196 |
if (--md->numleft < 0) return -1; |
|
0 | 197 |
|
198 |
s = *md->argv++; |
|
199 |
if (*s == '-') { |
|
200 |
md_continue_here:; |
|
201 |
s++; |
|
202 |
if (*s != 0) { |
|
203 |
// Found argument, try to locate it in options. |
|
204 |
if (*s == ':' || (r = strchr(md->options, *s)) == NULL) { |
|
205 |
// ERROR! |
|
206 |
return -2; |
|
207 |
} |
|
208 |
if (r[1] == ':') { |
|
209 |
// Item wants an argument. Check if the argument follows, or if it comes as a separate arg. |
|
210 |
if (!*(t = s + 1)) { |
|
211 |
// It comes as a separate arg. Check if out of args? |
|
212 |
if (--md->numleft < 0 || *(t = *md->argv) == '-') { |
|
213 |
// Check if item is optional? |
|
214 |
if (r[2] != ':') |
|
215 |
return -2; |
|
216 |
md->numleft++; |
|
217 |
t = NULL; |
|
218 |
} else { |
|
219 |
md->argv++; |
|
220 |
} |
|
221 |
} |
|
222 |
md->opt = t; |
|
223 |
md->cont = NULL; |
|
224 |
return *s; |
|
225 |
} |
|
226 |
md->opt = NULL; |
|
227 |
md->cont = s; |
|
228 |
return *s; |
|
229 |
} |
|
230 |
} else { |
|
231 |
// This is currently not supported. |
|
232 |
return -2; |
|
233 |
} |
|
234 |
} |
|
235 |
} |
|
236 |
||
237 |
||
4171 | 238 |
static void ParseResolution(int res[2], const char *s) |
0 | 239 |
{ |
240 |
char *t = strchr(s, 'x'); |
|
241 |
if (t == NULL) { |
|
242 |
ShowInfoF("Invalid resolution '%s'", s); |
|
243 |
return; |
|
244 |
} |
|
245 |
||
1764
a976570cdbd9
(svn r2268) - Fix [ 1195595 ] high resolutions don't work. Clamp all possible inputs of resolutions to the maximum availble
Darkvater
parents:
1688
diff
changeset
|
246 |
res[0] = clamp(strtoul(s, NULL, 0), 64, MAX_SCREEN_WIDTH); |
a976570cdbd9
(svn r2268) - Fix [ 1195595 ] high resolutions don't work. Clamp all possible inputs of resolutions to the maximum availble
Darkvater
parents:
1688
diff
changeset
|
247 |
res[1] = clamp(strtoul(t + 1, NULL, 0), 64, MAX_SCREEN_HEIGHT); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
248 |
} |
0 | 249 |
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
250 |
static void InitializeDynamicVariables(void) |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
251 |
{ |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
252 |
/* Dynamic stuff needs to be initialized somewhere... */ |
1267
cbd68e5e31ac
(svn r1771) -Add: Industries are now dynamic (up to 64k industries). Generating
truelight
parents:
1264
diff
changeset
|
253 |
_town_sort = NULL; |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
254 |
_industry_sort = NULL; |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
255 |
} |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
256 |
|
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
257 |
static void UnInitializeDynamicVariables(void) |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
258 |
{ |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
259 |
/* Dynamic stuff needs to be free'd somewhere... */ |
4983 | 260 |
CleanPool(&_Town_pool); |
4976
a0d7f63c35b5
(svn r6979) Use the pool macros for the Industry pool
tron
parents:
4972
diff
changeset
|
261 |
CleanPool(&_Industry_pool); |
4980 | 262 |
CleanPool(&_Station_pool); |
4972 | 263 |
CleanPool(&_Vehicle_pool); |
4979 | 264 |
CleanPool(&_Sign_pool); |
4977 | 265 |
CleanPool(&_Order_pool); |
1260
c60e76928e5c
(svn r1764) -Add: dynamic towns, you can now have up to 64k towns (let me know when
truelight
parents:
1246
diff
changeset
|
266 |
|
4277
3539bd14f023
(svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void*) casts
tron
parents:
4268
diff
changeset
|
267 |
free((void*)_town_sort); |
3539bd14f023
(svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void*) casts
tron
parents:
4268
diff
changeset
|
268 |
free((void*)_industry_sort); |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
269 |
} |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
270 |
|
1474
d83520edcda6
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
271 |
static void UnInitializeGame(void) |
d83520edcda6
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
272 |
{ |
d83520edcda6
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
273 |
UnInitWindowSystem(); |
1482
46a8146adecf
(svn r1986) - Fix: free _config_file when shutting down openttd. Strange that Valgrind didn't catch this, kudos to TrueLight
Darkvater
parents:
1478
diff
changeset
|
274 |
|
46a8146adecf
(svn r1986) - Fix: free _config_file when shutting down openttd. Strange that Valgrind didn't catch this, kudos to TrueLight
Darkvater
parents:
1478
diff
changeset
|
275 |
free(_config_file); |
1474
d83520edcda6
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
276 |
} |
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
277 |
|
1095 | 278 |
static void LoadIntroGame(void) |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
279 |
{ |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
280 |
char filename[256]; |
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
281 |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
282 |
_game_mode = GM_MENU; |
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
283 |
CLRBITS(_display_opt, DO_TRANS_BUILDINGS); // don't make buildings transparent in intro |
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
284 |
_opt_ptr = &_opt_newgame; |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
285 |
ResetGRFConfig(false); |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
286 |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
287 |
// Setup main window |
1474
d83520edcda6
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
288 |
ResetWindowSystem(); |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
289 |
SetupColorsAndInitialWindow(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
290 |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
291 |
// Generate a world. |
5296
6a4aaa66eed3
(svn r7449) -Codechange: Rename _path to _paths as it is technically more correct, but mainly because
Darkvater
parents:
5228
diff
changeset
|
292 |
snprintf(filename, lengthof(filename), "%sopntitle.dat", _paths.data_dir); |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3024
diff
changeset
|
293 |
#if defined SECOND_DATA_DIR |
921 | 294 |
if (SaveOrLoad(filename, SL_LOAD) != SL_OK) { |
5296
6a4aaa66eed3
(svn r7449) -Codechange: Rename _path to _paths as it is technically more correct, but mainly because
Darkvater
parents:
5228
diff
changeset
|
295 |
snprintf(filename, lengthof(filename), "%sopntitle.dat", _paths.second_data_dir); |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3024
diff
changeset
|
296 |
} |
561
e3b9689745ab
(svn r970) Added 2nd data path for all non-windows OSes
bjarni
parents:
557
diff
changeset
|
297 |
#endif |
3033
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3024
diff
changeset
|
298 |
if (SaveOrLoad(filename, SL_LOAD) != SL_OK) { |
e4f7c60a1742
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3024
diff
changeset
|
299 |
GenerateWorld(GW_EMPTY, 64, 64); // if failed loading, make empty world. |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
300 |
WaitTillGeneratedWorld(); |
921 | 301 |
} |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
302 |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
303 |
_pause = 0; |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
304 |
_local_player = 0; |
4336
d5cd47d24092
(svn r6037) -Fix: never allow scrolling the map in the main menu (scroll-settings weren't reset if switched to mainmenu)
truelight
parents:
4328
diff
changeset
|
305 |
/* Make sure you can't scroll in the menu */ |
d5cd47d24092
(svn r6037) -Fix: never allow scrolling the map in the main menu (scroll-settings weren't reset if switched to mainmenu)
truelight
parents:
4328
diff
changeset
|
306 |
_scrolling_viewport = 0; |
d5cd47d24092
(svn r6037) -Fix: never allow scrolling the map in the main menu (scroll-settings weren't reset if switched to mainmenu)
truelight
parents:
4328
diff
changeset
|
307 |
_cursor.fix_at = false; |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
308 |
MarkWholeScreenDirty(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
309 |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
310 |
// Play main theme |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
311 |
if (_music_driver->is_song_playing()) ResetMusic(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
312 |
} |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
313 |
|
2290 | 314 |
#if defined(UNIX) && !defined(__MORPHOS__) |
774
258c11431acb
(svn r1240) -Fix: OpenTTD once again compiles if ENABLE_NETWORK is disabled.
darkvater
parents:
770
diff
changeset
|
315 |
extern void DedicatedFork(void); |
2290 | 316 |
#endif |
704
a526dc96fbfc
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
317 |
|
4171 | 318 |
int ttd_main(int argc, char *argv[]) |
0 | 319 |
{ |
320 |
MyGetOptData mgo; |
|
321 |
int i; |
|
1010
17470a8e5eb7
(svn r1509) Const correctness and add static where appropriate while touching the lines anyway
tron
parents:
1009
diff
changeset
|
322 |
const char *optformat; |
469
d26f0e5705dc
(svn r702) -Fix: Buffer overflow in music/sound/video-driver-parameter (Oskar_)
truelight
parents:
430
diff
changeset
|
323 |
char musicdriver[16], sounddriver[16], videodriver[16]; |
0 | 324 |
int resolution[2] = {0,0}; |
4293
2c24234a7aec
(svn r5926) -Codechange: make _cur_year contain the full year, instead of the offset since 1920
rubidium
parents:
4285
diff
changeset
|
325 |
Year startyear = INVALID_YEAR; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
326 |
uint generation_seed = GENERATE_NEW_SEED; |
3058
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
327 |
bool dedicated = false; |
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
328 |
bool network = false; |
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
329 |
char *network_conn = NULL; |
1406
2d5baabe4046
(svn r1910) Move two variables out of variables.h which are only used locally
tron
parents:
1397
diff
changeset
|
330 |
|
0 | 331 |
musicdriver[0] = sounddriver[0] = videodriver[0] = 0; |
332 |
||
333 |
_game_mode = GM_MENU; |
|
334 |
_switch_mode = SM_MENU; |
|
172
8d8b3383470d
(svn r173) -Network: [1023231] Debug Code + ErrorBoxes + Load Game/Scenario. Added some more desync debug code and replaced some of the error() calls with some better error boxes. Hopefully find desyncs easier (sign_de)
darkvater
parents:
168
diff
changeset
|
335 |
_switch_mode_errorstr = INVALID_STRING_ID; |
704
a526dc96fbfc
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
336 |
_dedicated_forks = false; |
1482
46a8146adecf
(svn r1986) - Fix: free _config_file when shutting down openttd. Strange that Valgrind didn't catch this, kudos to TrueLight
Darkvater
parents:
1478
diff
changeset
|
337 |
_config_file = NULL; |
0 | 338 |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
339 |
// The last param of the following function means this: |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
340 |
// a letter means: it accepts that param (e.g.: -h) |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
341 |
// a ':' behind it means: it need a param (e.g.: -m<driver>) |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
342 |
// a '::' behind it means: it can optional have a param (e.g.: -d<debug>) |
4854
383ef523793f
(svn r6780) -Codechange: Remove GPMI leftovers (-b impersonisation of AI in MP).
Darkvater
parents:
4850
diff
changeset
|
343 |
optformat = "m:s:v:hDn::eit:d::r:g::G:c:" |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
344 |
#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32) |
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
345 |
"f" |
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
346 |
#endif |
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
347 |
; |
770
89dab23f04ca
(svn r1236) MorphOS: added make release like in OSX (tokai)
bjarni
parents:
768
diff
changeset
|
348 |
|
89dab23f04ca
(svn r1236) MorphOS: added make release like in OSX (tokai)
bjarni
parents:
768
diff
changeset
|
349 |
MyGetOptInit(&mgo, argc-1, argv+1, optformat); |
0 | 350 |
while ((i = MyGetOpt(&mgo)) != -1) { |
2951 | 351 |
switch (i) { |
0 | 352 |
case 'm': ttd_strlcpy(musicdriver, mgo.opt, sizeof(musicdriver)); break; |
353 |
case 's': ttd_strlcpy(sounddriver, mgo.opt, sizeof(sounddriver)); break; |
|
354 |
case 'v': ttd_strlcpy(videodriver, mgo.opt, sizeof(videodriver)); break; |
|
3058
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
355 |
case 'D': |
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
356 |
strcpy(musicdriver, "null"); |
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
357 |
strcpy(sounddriver, "null"); |
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
358 |
strcpy(videodriver, "dedicated"); |
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
359 |
dedicated = true; |
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
360 |
break; |
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
361 |
case 'f': _dedicated_forks = true; break; |
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
362 |
case 'n': |
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
363 |
network = true; |
3059
9f25d987c6ae
(svn r3648) - Fix typo in r3647, don't ask me how it got there s/_/./
Darkvater
parents:
3058
diff
changeset
|
364 |
network_conn = mgo.opt; // optional IP parameter, NULL if unset |
3058
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
365 |
break; |
0 | 366 |
case 'r': ParseResolution(resolution, mgo.opt); break; |
4285
72b3f7d6c891
(svn r5915) -Cleanup: some variables were named *_date while they were only holding years; rename these variables to match this.
rubidium
parents:
4277
diff
changeset
|
367 |
case 't': startyear = atoi(mgo.opt); break; |
0 | 368 |
case 'd': { |
369 |
#if defined(WIN32) |
|
370 |
CreateConsole(); |
|
371 |
#endif |
|
2639 | 372 |
if (mgo.opt != NULL) SetDebugString(mgo.opt); |
0 | 373 |
} break; |
374 |
case 'e': _switch_mode = SM_EDITOR; break; |
|
614
e016770cb781
(svn r1038) Feature: OpenTTD runs with the grf files of the DOS version
dominik
parents:
561
diff
changeset
|
375 |
case 'i': _use_dos_palette = true; break; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
376 |
case 'g': |
2639 | 377 |
if (mgo.opt != NULL) { |
0 | 378 |
strcpy(_file_to_saveload.name, mgo.opt); |
379 |
_switch_mode = SM_LOAD; |
|
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
380 |
} else { |
0 | 381 |
_switch_mode = SM_NEWGAME; |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
382 |
} |
0 | 383 |
break; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
384 |
case 'G': generation_seed = atoi(mgo.opt); break; |
3058
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
385 |
case 'c': _config_file = strdup(mgo.opt); break; |
0 | 386 |
case -2: |
2026 | 387 |
case 'h': |
0 | 388 |
showhelp(); |
389 |
return 0; |
|
390 |
} |
|
391 |
} |
|
392 |
||
393 |
DeterminePaths(); |
|
961 | 394 |
CheckExternalFiles(); |
704
a526dc96fbfc
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
395 |
|
2290 | 396 |
#if defined(UNIX) && !defined(__MORPHOS__) |
704
a526dc96fbfc
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
397 |
// We must fork here, or we'll end up without some resources we need (like sockets) |
a526dc96fbfc
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
398 |
if (_dedicated_forks) |
a526dc96fbfc
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
399 |
DedicatedFork(); |
a526dc96fbfc
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
400 |
#endif |
a526dc96fbfc
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
401 |
|
0 | 402 |
LoadFromConfig(); |
1688
787400219027
(svn r2192) - Add greater control to the 'message options' window. Now you can turn off the telegraphc ticker sound for summarized messages, or turn off news-messages altogether (you get a red blot to notify you though). The [<][>] set the settings in one way, while clicking on the option itself, cycles it. This commit also 'fixes' bugs [1166973], [1121484] and patch [1169930].
Darkvater
parents:
1608
diff
changeset
|
403 |
CheckConfig(); |
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:
961
diff
changeset
|
404 |
LoadFromHighScore(); |
0 | 405 |
|
406 |
// override config? |
|
469
d26f0e5705dc
(svn r702) -Fix: Buffer overflow in music/sound/video-driver-parameter (Oskar_)
truelight
parents:
430
diff
changeset
|
407 |
if (musicdriver[0]) ttd_strlcpy(_ini_musicdriver, musicdriver, sizeof(_ini_musicdriver)); |
d26f0e5705dc
(svn r702) -Fix: Buffer overflow in music/sound/video-driver-parameter (Oskar_)
truelight
parents:
430
diff
changeset
|
408 |
if (sounddriver[0]) ttd_strlcpy(_ini_sounddriver, sounddriver, sizeof(_ini_sounddriver)); |
d26f0e5705dc
(svn r702) -Fix: Buffer overflow in music/sound/video-driver-parameter (Oskar_)
truelight
parents:
430
diff
changeset
|
409 |
if (videodriver[0]) ttd_strlcpy(_ini_videodriver, videodriver, sizeof(_ini_videodriver)); |
0 | 410 |
if (resolution[0]) { _cur_resolution[0] = resolution[0]; _cur_resolution[1] = resolution[1]; } |
4293
2c24234a7aec
(svn r5926) -Codechange: make _cur_year contain the full year, instead of the offset since 1920
rubidium
parents:
4285
diff
changeset
|
411 |
if (startyear != INVALID_YEAR) _patches_newgame.starting_year = startyear; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
412 |
if (generation_seed != GENERATE_NEW_SEED) _patches_newgame.generation_seed = generation_seed; |
0 | 413 |
|
2951 | 414 |
if (_dedicated_forks && !dedicated) _dedicated_forks = false; |
704
a526dc96fbfc
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
415 |
|
0 | 416 |
// enumerate language files |
417 |
InitializeLanguagePacks(); |
|
418 |
||
419 |
// initialize screenshot formats |
|
420 |
InitializeScreenshotFormats(); |
|
421 |
||
105 | 422 |
// initialize airport state machines |
423 |
InitializeAirports(); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
424 |
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
425 |
/* initialize all variables that are allocated dynamically */ |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
426 |
InitializeDynamicVariables(); |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
427 |
|
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2383
diff
changeset
|
428 |
/* start the AI */ |
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2383
diff
changeset
|
429 |
AI_Initialize(); |
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2383
diff
changeset
|
430 |
|
0 | 431 |
// Sample catalogue |
432 |
DEBUG(misc, 1) ("Loading sound effects..."); |
|
1496
3d0b86f5dcb8
(svn r2000) Split the sound system into backend (mixer.[ch]) and frontend (sound.[ch])
tron
parents:
1482
diff
changeset
|
433 |
MxInitialize(11025); |
3d0b86f5dcb8
(svn r2000) Split the sound system into backend (mixer.[ch]) and frontend (sound.[ch])
tron
parents:
1482
diff
changeset
|
434 |
SoundInitialize("sample.cat"); |
0 | 435 |
|
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5024
diff
changeset
|
436 |
/* Initialize FreeType */ |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5024
diff
changeset
|
437 |
InitFreeType(); |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5024
diff
changeset
|
438 |
|
0 | 439 |
// This must be done early, since functions use the InvalidateWindow* calls |
139 | 440 |
InitWindowSystem(); |
0 | 441 |
|
5166
c40f2b19eca9
(svn r7273) -Fix (r7250): Initialise game palette before driver initialisation. This fixes a 'black screen' problem with fullscreen with the win32 video driver.
peter1138
parents:
5155
diff
changeset
|
442 |
/* Initialize game palette */ |
c40f2b19eca9
(svn r7273) -Fix (r7250): Initialise game palette before driver initialisation. This fixes a 'black screen' problem with fullscreen with the win32 video driver.
peter1138
parents:
5155
diff
changeset
|
443 |
GfxInitPalettes(); |
c40f2b19eca9
(svn r7273) -Fix (r7250): Initialise game palette before driver initialisation. This fixes a 'black screen' problem with fullscreen with the win32 video driver.
peter1138
parents:
5155
diff
changeset
|
444 |
|
3058
32bbf65085e8
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
445 |
DEBUG(driver, 1) ("Loading drivers..."); |
0 | 446 |
LoadDriver(SOUND_DRIVER, _ini_sounddriver); |
447 |
LoadDriver(MUSIC_DRIVER, _ini_musicdriver); |
|
448 |
LoadDriver(VIDEO_DRIVER, _ini_videodriver); // load video last, to prevent an empty window while sound and music loads |
|
2526
cae4842086a9
(svn r3055) Give the savegame/scenarion sort order flags symbolic names
tron
parents:
2498
diff
changeset
|
449 |
_savegame_sort_order = SORT_BY_DATE | SORT_DESCENDING; |
0 | 450 |
|
3678
599ea808a4f8
(svn r4595) - Fix (FS#63) Music volume is now restored to the value saved in openttd.cfg
glx
parents:
3676
diff
changeset
|
451 |
// restore saved music volume |
599ea808a4f8
(svn r4595) - Fix (FS#63) Music volume is now restored to the value saved in openttd.cfg
glx
parents:
3676
diff
changeset
|
452 |
_music_driver->set_volume(msf.music_vol); |
599ea808a4f8
(svn r4595) - Fix (FS#63) Music volume is now restored to the value saved in openttd.cfg
glx
parents:
3676
diff
changeset
|
453 |
|
4830
0ff2a14e90be
(svn r6754) -Codechange: Remove some #idef ENABLE_NETWORK specific defines. With networking
Darkvater
parents:
4829
diff
changeset
|
454 |
NetworkStartUp(); // initialize network-core |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
455 |
|
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
456 |
ScanNewGRFFiles(); |
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
457 |
|
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
458 |
_opt_ptr = &_opt_newgame; |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
459 |
ResetGRFConfig(false); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
460 |
|
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
461 |
/* XXX - ugly hack, if diff_level is 9, it means we got no setting from the config file */ |
2951 | 462 |
if (_opt_newgame.diff_level == 9) SetDifficultyLevel(0, &_opt_newgame); |
0 | 463 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
464 |
/* Make sure _patches is filled with _patches_newgame if we switch to a game directly */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
465 |
if (_switch_mode != SM_NONE) { |
5024
f13f2f2d43f9
(svn r7065) Use simple assignment instead of memcpy()
tron
parents:
5015
diff
changeset
|
466 |
_opt = _opt_newgame; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
467 |
UpdatePatches(); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
468 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
469 |
|
139 | 470 |
// initialize the ingame console |
471 |
IConsoleInit(); |
|
3312
593789444b01
(svn r4075) - Feature: Undraw the mouse when it leaves the window and Draw it again when it enters. Added both for WIN32 and SDL. Since Win95 has troubles with TrackMouseEvent(), this function was just simply rewritten which was the easiest. Based on a patch by DmitryKo.
Darkvater
parents:
3274
diff
changeset
|
472 |
_cursor.in_window = true; |
1246
45f15251412b
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1243
diff
changeset
|
473 |
InitializeGUI(); |
644
e833509107ad
(svn r1077) Implements scripts/autoexec.scr to get executed on game starting (sign_de)
dominik
parents:
630
diff
changeset
|
474 |
IConsoleCmdExec("exec scripts/autoexec.scr 0"); |
656
01540e6c0fed
(svn r1090) -Fix: Made the _openttd_revision variable global, and with that
truelight
parents:
644
diff
changeset
|
475 |
|
2828
996de8e891c7
(svn r3376) -Codechange: made enums for GenerateWorld and InitializeGame 'mode'
truelight
parents:
2818
diff
changeset
|
476 |
GenerateWorld(GW_EMPTY, 64, 64); // Make the viewport initialization happy |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
477 |
WaitTillGeneratedWorld(); |
1268
306ebfea663a
(svn r1772) -Fix: [ 1114100 ] Dedicated server boots again
truelight
parents:
1267
diff
changeset
|
478 |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
479 |
#ifdef ENABLE_NETWORK |
2951 | 480 |
if (network && _network_available) { |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
481 |
if (network_conn != NULL) { |
1329 | 482 |
const char *port = NULL; |
483 |
const char *player = NULL; |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
484 |
uint16 rport; |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
485 |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
486 |
rport = NETWORK_DEFAULT_PORT; |
4878
744717de172e
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4861
diff
changeset
|
487 |
_network_playas = PLAYER_NEW_COMPANY; |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
488 |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
489 |
ParseConnectionString(&player, &port, network_conn); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
490 |
|
4861
f28bfa84f9ad
(svn r6787) -Codechange: Use PLAYER_NEW_COMPANY as a player identifier wishing to become a
Darkvater
parents:
4854
diff
changeset
|
491 |
if (player != NULL) { |
f28bfa84f9ad
(svn r6787) -Codechange: Use PLAYER_NEW_COMPANY as a player identifier wishing to become a
Darkvater
parents:
4854
diff
changeset
|
492 |
_network_playas = atoi(player); |
4878
744717de172e
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4861
diff
changeset
|
493 |
|
4880
0708f34e3586
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
494 |
if (_network_playas != PLAYER_SPECTATOR) { |
0708f34e3586
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
495 |
_network_playas--; |
4878
744717de172e
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4861
diff
changeset
|
496 |
if (!IsValidPlayer(_network_playas)) return false; |
744717de172e
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4861
diff
changeset
|
497 |
} |
4861
f28bfa84f9ad
(svn r6787) -Codechange: Use PLAYER_NEW_COMPANY as a player identifier wishing to become a
Darkvater
parents:
4854
diff
changeset
|
498 |
} |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
499 |
if (port != NULL) rport = atoi(port); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
500 |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
501 |
LoadIntroGame(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
502 |
_switch_mode = SM_NONE; |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
503 |
NetworkClientConnectGame(network_conn, rport); |
1109
1bab892228cd
(svn r1610) Remove trailing whitespace (last time ever, i hope)
tron
parents:
1105
diff
changeset
|
504 |
} |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
505 |
} |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
506 |
#endif /* ENABLE_NETWORK */ |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
507 |
|
2228 | 508 |
_video_driver->main_loop(); |
139 | 509 |
|
2285
3193cbd1ba88
(svn r2809) Implement more generic threading functions, which allow more than one thread
tron
parents:
2234
diff
changeset
|
510 |
WaitTillSaved(); |
139 | 511 |
IConsoleFree(); |
0 | 512 |
|
4830
0ff2a14e90be
(svn r6754) -Codechange: Remove some #idef ENABLE_NETWORK specific defines. With networking
Darkvater
parents:
4829
diff
changeset
|
513 |
if (_network_available) NetworkShutDown(); // Shut down the network and close any open connections |
0 | 514 |
|
515 |
_video_driver->stop(); |
|
516 |
_music_driver->stop(); |
|
517 |
_sound_driver->stop(); |
|
518 |
||
519 |
SaveToConfig(); |
|
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:
961
diff
changeset
|
520 |
SaveToHighScore(); |
0 | 521 |
|
105 | 522 |
// uninitialize airport state machines |
523 |
UnInitializeAirports(); |
|
0 | 524 |
|
919
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
525 |
/* uninitialize variables that are allocated dynamic */ |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
526 |
UnInitializeDynamicVariables(); |
b0d6c7642f99
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
527 |
|
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2383
diff
changeset
|
528 |
/* stop the AI */ |
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2383
diff
changeset
|
529 |
AI_Uninitialize(); |
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2383
diff
changeset
|
530 |
|
1036
5f0c307fbadd
(svn r1537) -Fix: Close all and any open filehandles open at shutdown (tamlin)
darkvater
parents:
1035
diff
changeset
|
531 |
/* Close all and any open filehandles */ |
5f0c307fbadd
(svn r1537) -Fix: Close all and any open filehandles open at shutdown (tamlin)
darkvater
parents:
1035
diff
changeset
|
532 |
FioCloseAll(); |
1474
d83520edcda6
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
533 |
UnInitializeGame(); |
1036
5f0c307fbadd
(svn r1537) -Fix: Close all and any open filehandles open at shutdown (tamlin)
darkvater
parents:
1035
diff
changeset
|
534 |
|
0 | 535 |
return 0; |
536 |
} |
|
537 |
||
4548
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
538 |
void HandleExitGameRequest(void) |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
539 |
{ |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
540 |
if (_game_mode == GM_MENU) { // do not ask to quit on the main screen |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
541 |
_exit_game = true; |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
542 |
} else if (_patches.autosave_on_exit) { |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
543 |
DoExitSave(); |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
544 |
_exit_game = true; |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
545 |
} else { |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
546 |
AskExitGame(); |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
547 |
} |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
548 |
} |
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
549 |
|
23b56455df33
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
550 |
|
2380
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
551 |
/** Mutex so that only one thread can communicate with the main program |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
552 |
* at any given time */ |
4323
78204e7c3100
(svn r5977) -Fix [FS#78]: never set I-am-a-thread bool to true IN the thread. Machines with
truelight
parents:
4300
diff
changeset
|
553 |
static ThreadMsg _message = MSG_OTTD_NO_MESSAGE; |
2380
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
554 |
|
4323
78204e7c3100
(svn r5977) -Fix [FS#78]: never set I-am-a-thread bool to true IN the thread. Machines with
truelight
parents:
4300
diff
changeset
|
555 |
static inline void OTTD_ReleaseMutex(void) {_message = MSG_OTTD_NO_MESSAGE;} |
2380
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
556 |
static inline ThreadMsg OTTD_PollThreadEvent(void) {return _message;} |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
557 |
|
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
558 |
/** Called by running thread to execute some action in the main game. |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
559 |
* It will stall as long as the mutex is not freed (handled) by the game */ |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
560 |
void OTTD_SendThreadMessage(ThreadMsg msg) |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
561 |
{ |
2383
80ff60d10aed
(svn r2909) Game would hang where the autosave_on_exit was activated.
Darkvater
parents:
2380
diff
changeset
|
562 |
if (_exit_game) return; |
4323
78204e7c3100
(svn r5977) -Fix [FS#78]: never set I-am-a-thread bool to true IN the thread. Machines with
truelight
parents:
4300
diff
changeset
|
563 |
while (_message != MSG_OTTD_NO_MESSAGE) CSleep(10); |
2380
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
564 |
|
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
565 |
_message = msg; |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
566 |
} |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
567 |
|
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
568 |
|
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
569 |
/** Handle the user-messages sent to us |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
570 |
* @param message message sent |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
571 |
*/ |
2817 | 572 |
static void ProcessSentMessage(ThreadMsg message) |
2380
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
573 |
{ |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
574 |
switch (message) { |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
575 |
case MSG_OTTD_SAVETHREAD_DONE: SaveFileDone(); break; |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
576 |
case MSG_OTTD_SAVETHREAD_ERROR: SaveFileError(); break; |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
577 |
default: NOT_REACHED(); |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
578 |
} |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
579 |
|
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
580 |
OTTD_ReleaseMutex(); // release mutex so that other threads, messages can be handled |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
581 |
} |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
582 |
|
0 | 583 |
static void ShowScreenshotResult(bool b) |
584 |
{ |
|
585 |
if (b) { |
|
2055
9361b56db8ba
(svn r2564) Fix: Fixed conceptual issue in network_gui.c. AllocateName is not meant to be used by GUI-code, because it modifies the "game-state".
ludde
parents:
2051
diff
changeset
|
586 |
SetDParamStr(0, _screenshot_name); |
0 | 587 |
ShowErrorMessage(INVALID_STRING_ID, STR_031B_SCREENSHOT_SUCCESSFULLY, 0, 0); |
588 |
} else { |
|
589 |
ShowErrorMessage(INVALID_STRING_ID, STR_031C_SCREENSHOT_FAILED, 0, 0); |
|
590 |
} |
|
591 |
||
592 |
} |
|
593 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
594 |
static void MakeNewGameDone(void) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
595 |
{ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
596 |
/* In a dedicated server, the server does not play */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
597 |
if (_network_dedicated) { |
4848
56549aa3e234
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4840
diff
changeset
|
598 |
_local_player = PLAYER_SPECTATOR; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
599 |
return; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
600 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
601 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
602 |
/* Create a single player */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
603 |
DoStartupNewPlayer(false); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
604 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
605 |
_local_player = 0; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
606 |
_current_player = _local_player; |
4661
59492734db06
(svn r6544) - Codechange: Rename CmdReplaceVehicle to CmdSetAutoReplace, to reflect what it does.
peter1138
parents:
4603
diff
changeset
|
607 |
DoCommandP(0, (_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4, _patches.autorenew_money, NULL, CMD_SET_AUTOREPLACE); |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
608 |
|
5116
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
609 |
SettingsDisableElrail(_patches.disable_elrails); |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
610 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
611 |
MarkWholeScreenDirty(); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
612 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
613 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
614 |
static void MakeNewGame(bool from_heightmap) |
0 | 615 |
{ |
616 |
_game_mode = GM_NORMAL; |
|
617 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
618 |
GenerateWorldSetCallback(&MakeNewGameDone); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
619 |
GenerateWorld(from_heightmap ? GW_HEIGHTMAP : GW_NEWGAME, 1 << _patches.map_x, 1 << _patches.map_y); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
620 |
} |
0 | 621 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
622 |
static void MakeNewEditorWorldDone(void) |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
623 |
{ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
624 |
_local_player = OWNER_NONE; |
0 | 625 |
|
626 |
MarkWholeScreenDirty(); |
|
627 |
} |
|
628 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
629 |
static void MakeNewEditorWorld(void) |
0 | 630 |
{ |
631 |
_game_mode = GM_EDITOR; |
|
632 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
633 |
GenerateWorldSetCallback(&MakeNewEditorWorldDone); |
2828
996de8e891c7
(svn r3376) -Codechange: made enums for GenerateWorld and InitializeGame 'mode'
truelight
parents:
2818
diff
changeset
|
634 |
GenerateWorld(GW_EMPTY, 1 << _patches.map_x, 1 << _patches.map_y); |
0 | 635 |
} |
636 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
637 |
void StartupPlayers(void); |
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
638 |
void StartupDisasters(void); |
3891
b39019cd32cf
(svn r4947) - Fix [FS#145]: Starting scenarios did not adhere to local difficulty settings
Darkvater
parents:
3889
diff
changeset
|
639 |
extern void StartupEconomy(void); |
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
115
diff
changeset
|
640 |
|
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
641 |
/** |
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
642 |
* Start Scenario starts a new game based on a scenario. |
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
643 |
* Eg 'New Game' --> select a preset scenario |
1501
0faec0f792b0
(svn r2005) - Fix: fix previous commit. Using 'New Game (scenario)' will use YOUR difficulty settings but ingame options (eg townnames, currency). Also settings are correctly saved when closing the difficulty window now.
Darkvater
parents:
1500
diff
changeset
|
644 |
* This starts a scenario based on your current difficulty settings |
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
645 |
*/ |
1095 | 646 |
static void StartScenario(void) |
0 | 647 |
{ |
648 |
_game_mode = GM_NORMAL; |
|
649 |
||
650 |
// invalid type |
|
651 |
if (_file_to_saveload.mode == SL_INVALID) { |
|
5015
8e2f6a5df288
(svn r7048) -Cleanup: DEBUG doesn't need a newline character, use DEBUG instead of printf and the
Darkvater
parents:
4983
diff
changeset
|
652 |
DEBUG(misc, 0) ("[Sl] Savegame is obsolete or invalid format: %s", _file_to_saveload.name); |
2749
46aba09ca365
(svn r3294) - Fix: use INVALID_STRING_ID instead of -1.
Darkvater
parents:
2701
diff
changeset
|
653 |
ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0); |
0 | 654 |
_game_mode = GM_MENU; |
655 |
return; |
|
656 |
} |
|
657 |
||
136
78ac8de2b2b8
(svn r137) Fix: console sometime didn't open (sign_de)
dominik
parents:
126
diff
changeset
|
658 |
// Reinitialize windows |
1474
d83520edcda6
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
659 |
ResetWindowSystem(); |
0 | 660 |
|
661 |
SetupColorsAndInitialWindow(); |
|
662 |
||
663 |
// Load game |
|
664 |
if (SaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode) != SL_OK) { |
|
665 |
LoadIntroGame(); |
|
2749
46aba09ca365
(svn r3294) - Fix: use INVALID_STRING_ID instead of -1.
Darkvater
parents:
2701
diff
changeset
|
666 |
ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0); |
0 | 667 |
} |
668 |
||
1501
0faec0f792b0
(svn r2005) - Fix: fix previous commit. Using 'New Game (scenario)' will use YOUR difficulty settings but ingame options (eg townnames, currency). Also settings are correctly saved when closing the difficulty window now.
Darkvater
parents:
1500
diff
changeset
|
669 |
_opt_ptr = &_opt; |
5024
f13f2f2d43f9
(svn r7065) Use simple assignment instead of memcpy()
tron
parents:
5015
diff
changeset
|
670 |
_opt_ptr->diff = _opt_newgame.diff; |
1501
0faec0f792b0
(svn r2005) - Fix: fix previous commit. Using 'New Game (scenario)' will use YOUR difficulty settings but ingame options (eg townnames, currency). Also settings are correctly saved when closing the difficulty window now.
Darkvater
parents:
1500
diff
changeset
|
671 |
_opt.diff_level = _opt_newgame.diff_level; |
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
672 |
|
115
3a3c64e7be82
(svn r116) Fix: [ 963056 ] Wrong trains you can buy with scenarios
dominik
parents:
105
diff
changeset
|
673 |
// Inititalize data |
3891
b39019cd32cf
(svn r4947) - Fix [FS#145]: Starting scenarios did not adhere to local difficulty settings
Darkvater
parents:
3889
diff
changeset
|
674 |
StartupEconomy(); |
115
3a3c64e7be82
(svn r116) Fix: [ 963056 ] Wrong trains you can buy with scenarios
dominik
parents:
105
diff
changeset
|
675 |
StartupPlayers(); |
3a3c64e7be82
(svn r116) Fix: [ 963056 ] Wrong trains you can buy with scenarios
dominik
parents:
105
diff
changeset
|
676 |
StartupEngines(); |
3a3c64e7be82
(svn r116) Fix: [ 963056 ] Wrong trains you can buy with scenarios
dominik
parents:
105
diff
changeset
|
677 |
StartupDisasters(); |
3a3c64e7be82
(svn r116) Fix: [ 963056 ] Wrong trains you can buy with scenarios
dominik
parents:
105
diff
changeset
|
678 |
|
0 | 679 |
_local_player = 0; |
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
680 |
_current_player = _local_player; |
4661
59492734db06
(svn r6544) - Codechange: Rename CmdReplaceVehicle to CmdSetAutoReplace, to reflect what it does.
peter1138
parents:
4603
diff
changeset
|
681 |
DoCommandP(0, (_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4, _patches.autorenew_money, NULL, CMD_SET_AUTOREPLACE); |
0 | 682 |
|
683 |
MarkWholeScreenDirty(); |
|
684 |
} |
|
685 |
||
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
686 |
bool SafeSaveOrLoad(const char *filename, int mode, int newgm) |
0 | 687 |
{ |
688 |
byte ogm = _game_mode; |
|
689 |
||
690 |
_game_mode = newgm; |
|
3024 | 691 |
switch (SaveOrLoad(filename, mode)) { |
692 |
case SL_OK: return true; |
|
693 |
||
694 |
case SL_REINIT: |
|
695 |
switch (ogm) { |
|
696 |
case GM_MENU: LoadIntroGame(); break; |
|
697 |
case GM_EDITOR: MakeNewEditorWorld(); break; |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
698 |
default: MakeNewGame(false); break; |
3024 | 699 |
} |
700 |
return false; |
|
701 |
||
702 |
default: |
|
703 |
_game_mode = ogm; |
|
704 |
return false; |
|
2639 | 705 |
} |
0 | 706 |
} |
707 |
||
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
708 |
void SwitchMode(int new_mode) |
0 | 709 |
{ |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
710 |
#ifdef ENABLE_NETWORK |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
711 |
// If we are saving something, the network stays in his current state |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
712 |
if (new_mode != SM_SAVE) { |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
713 |
// If the network is active, make it not-active |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
714 |
if (_networking) { |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
715 |
if (_network_server && (new_mode == SM_LOAD || new_mode == SM_NEWGAME)) { |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
716 |
NetworkReboot(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
717 |
NetworkUDPClose(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
718 |
} else { |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
719 |
NetworkDisconnect(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
720 |
NetworkUDPClose(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
721 |
} |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
722 |
} |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
723 |
|
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
724 |
// If we are a server, we restart the server |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
725 |
if (_is_network_server) { |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
726 |
// But not if we are going to the menu |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
727 |
if (new_mode != SM_MENU) { |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
728 |
NetworkServerStart(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
729 |
} else { |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
730 |
// This client no longer wants to be a network-server |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
731 |
_is_network_server = false; |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
732 |
} |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
733 |
} |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
734 |
} |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
735 |
#endif /* ENABLE_NETWORK */ |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
736 |
|
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
737 |
switch (new_mode) { |
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
738 |
case SM_EDITOR: /* Switch to scenario editor */ |
0 | 739 |
MakeNewEditorWorld(); |
740 |
break; |
|
741 |
||
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
742 |
case SM_NEWGAME: /* New Game --> 'Random game' */ |
630
fd3c36132342
(svn r1061) -Fix: [Network] Compiling without ENABLE_NETWORK now works again correctly
truelight
parents:
614
diff
changeset
|
743 |
#ifdef ENABLE_NETWORK |
2951 | 744 |
if (_network_server) { |
2989 | 745 |
snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "Random Map"); |
2951 | 746 |
} |
630
fd3c36132342
(svn r1061) -Fix: [Network] Compiling without ENABLE_NETWORK now works again correctly
truelight
parents:
614
diff
changeset
|
747 |
#endif /* ENABLE_NETWORK */ |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
748 |
MakeNewGame(false); |
0 | 749 |
break; |
750 |
||
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
751 |
case SM_START_SCENARIO: /* New Game --> Choose one of the preset scenarios */ |
2951 | 752 |
#ifdef ENABLE_NETWORK |
753 |
if (_network_server) { |
|
2989 | 754 |
snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Loaded scenario)", _file_to_saveload.title); |
2951 | 755 |
} |
756 |
#endif /* ENABLE_NETWORK */ |
|
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
757 |
StartScenario(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
758 |
break; |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
759 |
|
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
760 |
case SM_LOAD: { /* Load game, Play Scenario */ |
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
761 |
_opt_ptr = &_opt; |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
762 |
ResetGRFConfig(true); |
0 | 763 |
|
764 |
if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL)) { |
|
942
31f28eedd2b8
(svn r1430) -Fix: starting openttd with -g <invalid_name> now acts normal
truelight
parents:
929
diff
changeset
|
765 |
LoadIntroGame(); |
2749
46aba09ca365
(svn r3294) - Fix: use INVALID_STRING_ID instead of -1.
Darkvater
parents:
2701
diff
changeset
|
766 |
ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0); |
0 | 767 |
} else { |
5197
a441951424e7
(svn r7312) -Fix: When loading a game from a dedicated server the local player global variable was
Darkvater
parents:
5170
diff
changeset
|
768 |
/* Update the local player for a loaded game. It is either always |
a441951424e7
(svn r7312) -Fix: When loading a game from a dedicated server the local player global variable was
Darkvater
parents:
5170
diff
changeset
|
769 |
* player #1 (eg 0) or in the case of a dedicated server a spectator */ |
a441951424e7
(svn r7312) -Fix: When loading a game from a dedicated server the local player global variable was
Darkvater
parents:
5170
diff
changeset
|
770 |
_local_player = _network_dedicated ? PLAYER_SPECTATOR : 0; |
0 | 771 |
DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // decrease pause counter (was increased from opening load dialog) |
630
fd3c36132342
(svn r1061) -Fix: [Network] Compiling without ENABLE_NETWORK now works again correctly
truelight
parents:
614
diff
changeset
|
772 |
#ifdef ENABLE_NETWORK |
2951 | 773 |
if (_network_server) { |
2989 | 774 |
snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Loaded game)", _file_to_saveload.title); |
2951 | 775 |
} |
630
fd3c36132342
(svn r1061) -Fix: [Network] Compiling without ENABLE_NETWORK now works again correctly
truelight
parents:
614
diff
changeset
|
776 |
#endif /* ENABLE_NETWORK */ |
0 | 777 |
} |
778 |
break; |
|
779 |
} |
|
780 |
||
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
781 |
case SM_START_HEIGHTMAP: /* Load a heightmap and start a new game from it */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
782 |
#ifdef ENABLE_NETWORK |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
783 |
if (_network_server) { |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
784 |
snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Heightmap)", _file_to_saveload.title); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
785 |
} |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
786 |
#endif /* ENABLE_NETWORK */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
787 |
MakeNewGame(true); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
788 |
break; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
789 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
790 |
case SM_LOAD_HEIGHTMAP: /* Load heightmap from scenario editor */ |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
791 |
_local_player = OWNER_NONE; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
792 |
|
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
793 |
GenerateWorld(GW_HEIGHTMAP, 1 << _patches.map_x, 1 << _patches.map_y); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
794 |
MarkWholeScreenDirty(); |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
795 |
break; |
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
796 |
|
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
797 |
case SM_LOAD_SCENARIO: { /* Load scenario from scenario editor */ |
2634
16334e1a4862
(svn r3176) Use proper types, not some variants of int
tron
parents:
2631
diff
changeset
|
798 |
if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR)) { |
4260
8a9824f6e501
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4184
diff
changeset
|
799 |
Player *p; |
0 | 800 |
|
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
801 |
_opt_ptr = &_opt; |
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
802 |
ResetGRFConfig(true); |
0 | 803 |
|
804 |
_local_player = OWNER_NONE; |
|
805 |
_generating_world = true; |
|
4260
8a9824f6e501
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4184
diff
changeset
|
806 |
/* Delete all players */ |
8a9824f6e501
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4184
diff
changeset
|
807 |
FOR_ALL_PLAYERS(p) { |
8a9824f6e501
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4184
diff
changeset
|
808 |
if (p->is_active) { |
4848
56549aa3e234
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4840
diff
changeset
|
809 |
ChangeOwnershipOfPlayerItems(p->index, PLAYER_SPECTATOR); |
4260
8a9824f6e501
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4184
diff
changeset
|
810 |
p->is_active = false; |
8a9824f6e501
(svn r5886) -Fix [FS#273]: Incomplete removal of player owned property due to lack of money.
Darkvater
parents:
4184
diff
changeset
|
811 |
} |
0 | 812 |
} |
813 |
_generating_world = false; |
|
4537
fefcd6142977
(svn r6366) -Fix (FS#324): when opening a scenario, the date was set 1920 years into the future.
rubidium
parents:
4536
diff
changeset
|
814 |
_patches_newgame.starting_year = _cur_year; |
0 | 815 |
// delete all stations owned by a player |
816 |
DeleteAllPlayerStations(); |
|
2639 | 817 |
} else { |
0 | 818 |
ShowErrorMessage(INVALID_STRING_ID, STR_4009_GAME_LOAD_FAILED, 0, 0); |
2639 | 819 |
} |
0 | 820 |
break; |
821 |
} |
|
822 |
||
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
823 |
case SM_MENU: /* Switch to game intro menu */ |
0 | 824 |
LoadIntroGame(); |
825 |
break; |
|
826 |
||
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
827 |
case SM_SAVE: /* Save game */ |
2639 | 828 |
if (SaveOrLoad(_file_to_saveload.name, SL_SAVE) != SL_OK) { |
0 | 829 |
ShowErrorMessage(INVALID_STRING_ID, STR_4007_GAME_SAVE_FAILED, 0, 0); |
2639 | 830 |
} else { |
0 | 831 |
DeleteWindowById(WC_SAVELOAD, 0); |
2639 | 832 |
} |
0 | 833 |
break; |
834 |
||
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
835 |
case SM_GENRANDLAND: /* Generate random land within scenario editor */ |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
836 |
_local_player = OWNER_NONE; |
2951 | 837 |
GenerateWorld(GW_RANDOM, 1 << _patches.map_x, 1 << _patches.map_y); |
0 | 838 |
// XXX: set date |
839 |
MarkWholeScreenDirty(); |
|
840 |
break; |
|
841 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
842 |
|
2951 | 843 |
if (_switch_mode_errorstr != INVALID_STRING_ID) { |
844 |
ShowErrorMessage(INVALID_STRING_ID, _switch_mode_errorstr, 0, 0); |
|
845 |
} |
|
0 | 846 |
} |
847 |
||
848 |
||
849 |
// State controlling game loop. |
|
850 |
// The state must not be changed from anywhere |
|
851 |
// but here. |
|
852 |
// That check is enforced in DoCommand. |
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
853 |
void StateGameLoop(void) |
0 | 854 |
{ |
213
770e504a6e51
(svn r214) -Feature: CMD_NET_INSTANT [just in time command handling over network] (sign_de)
darkvater
parents:
208
diff
changeset
|
855 |
// dont execute the state loop during pause |
770e504a6e51
(svn r214) -Feature: CMD_NET_INSTANT [just in time command handling over network] (sign_de)
darkvater
parents:
208
diff
changeset
|
856 |
if (_pause) return; |
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
857 |
if (IsGeneratingWorld()) return; |
213
770e504a6e51
(svn r214) -Feature: CMD_NET_INSTANT [just in time command handling over network] (sign_de)
darkvater
parents:
208
diff
changeset
|
858 |
|
0 | 859 |
if (_game_mode == GM_EDITOR) { |
860 |
RunTileLoop(); |
|
861 |
CallVehicleTicks(); |
|
862 |
CallLandscapeTick(); |
|
863 |
CallWindowTickEvent(); |
|
864 |
NewsLoop(); |
|
865 |
} else { |
|
206 | 866 |
// All these actions has to be done from OWNER_NONE |
867 |
// for multiplayer compatibility |
|
2498
befad2fe53d2
(svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants
tron
parents:
2469
diff
changeset
|
868 |
PlayerID p = _current_player; |
206 | 869 |
_current_player = OWNER_NONE; |
870 |
||
0 | 871 |
AnimateAnimatedTiles(); |
872 |
IncreaseDate(); |
|
873 |
RunTileLoop(); |
|
874 |
CallVehicleTicks(); |
|
875 |
CallLandscapeTick(); |
|
876 |
||
2395
19b4da30806b
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2383
diff
changeset
|
877 |
AI_RunGameLoop(); |
0 | 878 |
|
879 |
CallWindowTickEvent(); |
|
880 |
NewsLoop(); |
|
206 | 881 |
_current_player = p; |
0 | 882 |
} |
883 |
} |
|
884 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
885 |
static void DoAutosave(void) |
0 | 886 |
{ |
887 |
char buf[200]; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
888 |
|
4848
56549aa3e234
(svn r6774) -Codechange: Rename the badly named OWNER_SPECTATOR to PLAYER_SPECTATOR and
Darkvater
parents:
4840
diff
changeset
|
889 |
if (_patches.keep_all_autosave && _local_player != PLAYER_SPECTATOR) { |
1962
51ee4f459268
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
celestar
parents:
1927
diff
changeset
|
890 |
const Player *p = GetPlayer(_local_player); |
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4880
diff
changeset
|
891 |
char* s = buf; |
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4880
diff
changeset
|
892 |
|
5296
6a4aaa66eed3
(svn r7449) -Codechange: Rename _path to _paths as it is technically more correct, but mainly because
Darkvater
parents:
5228
diff
changeset
|
893 |
s += snprintf(buf, lengthof(buf), "%s%s", _paths.autosave_dir, PATHSEP); |
1500
228f77e88adf
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
894 |
|
534
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
895 |
SetDParam(0, p->name_1); |
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
896 |
SetDParam(1, p->name_2); |
17ab2f22ff74
(svn r901) Small step in the process to clean up the DPARAM mess:
tron
parents:
507
diff
changeset
|
897 |
SetDParam(2, _date); |
4912
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4880
diff
changeset
|
898 |
s = GetString(s, STR_4004, lastof(buf)); |
d04b3f2bca70
(svn r6884) -Codechange: Add strict bounds checking in string formatting system.
Darkvater
parents:
4880
diff
changeset
|
899 |
strecpy(s, ".sav", lastof(buf)); |
2672
ea469d7b34ff
(svn r3214) -Feature: openttd.cfg can now set how many autosaves to keep before starting to overwrite old ones
bjarni
parents:
2670
diff
changeset
|
900 |
} else { /* generate a savegame name and number according to _patches.max_num_autosaves */ |
5296
6a4aaa66eed3
(svn r7449) -Codechange: Rename _path to _paths as it is technically more correct, but mainly because
Darkvater
parents:
5228
diff
changeset
|
901 |
snprintf(buf, lengthof(buf), "%s%sautosave%d.sav", _paths.autosave_dir, PATHSEP, _autosave_ctr); |
2672
ea469d7b34ff
(svn r3214) -Feature: openttd.cfg can now set how many autosaves to keep before starting to overwrite old ones
bjarni
parents:
2670
diff
changeset
|
902 |
|
ea469d7b34ff
(svn r3214) -Feature: openttd.cfg can now set how many autosaves to keep before starting to overwrite old ones
bjarni
parents:
2670
diff
changeset
|
903 |
_autosave_ctr++; |
ea469d7b34ff
(svn r3214) -Feature: openttd.cfg can now set how many autosaves to keep before starting to overwrite old ones
bjarni
parents:
2670
diff
changeset
|
904 |
if (_autosave_ctr >= _patches.max_num_autosaves) { |
ea469d7b34ff
(svn r3214) -Feature: openttd.cfg can now set how many autosaves to keep before starting to overwrite old ones
bjarni
parents:
2670
diff
changeset
|
905 |
// we reached the limit for numbers of autosaves. We will start over |
ea469d7b34ff
(svn r3214) -Feature: openttd.cfg can now set how many autosaves to keep before starting to overwrite old ones
bjarni
parents:
2670
diff
changeset
|
906 |
_autosave_ctr = 0; |
ea469d7b34ff
(svn r3214) -Feature: openttd.cfg can now set how many autosaves to keep before starting to overwrite old ones
bjarni
parents:
2670
diff
changeset
|
907 |
} |
0 | 908 |
} |
909 |
||
557
8540788a827e
(svn r959) -Fix: fix previous typo for workaround of braindead MSVC6 (Tron)
darkvater
parents:
543
diff
changeset
|
910 |
DEBUG(misc, 2) ("Autosaving to %s", buf); |
0 | 911 |
if (SaveOrLoad(buf, SL_SAVE) != SL_OK) |
912 |
ShowErrorMessage(INVALID_STRING_ID, STR_AUTOSAVE_FAILED, 0, 0); |
|
913 |
} |
|
914 |
||
1397
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
915 |
static void ScrollMainViewport(int x, int y) |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
916 |
{ |
4536
f13408cba18f
(svn r6365) -Cleanup: remove IsGeneratingWorld calls that are either not called or have no effect.
rubidium
parents:
4502
diff
changeset
|
917 |
if (_game_mode != GM_MENU) { |
1397
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
918 |
Window *w = FindWindowById(WC_MAIN_WINDOW, 0); |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
919 |
assert(w); |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
920 |
|
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
921 |
WP(w,vp_d).scrollpos_x += x << w->viewport->zoom; |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
922 |
WP(w,vp_d).scrollpos_y += y << w->viewport->zoom; |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
923 |
} |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
924 |
} |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
925 |
|
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
926 |
static const int8 scrollamt[16][2] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
927 |
{ 0, 0}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
928 |
{-2, 0}, // 1 : left |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
929 |
{ 0, -2}, // 2 : up |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
930 |
{-2, -1}, // 3 : left + up |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
931 |
{ 2, 0}, // 4 : right |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
932 |
{ 0, 0}, // 5 : left + right |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
933 |
{ 2, -1}, // 6 : right + up |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
934 |
{ 0, -2}, // 7 : left + right + up = up |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
935 |
{ 0 ,2}, // 8 : down |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
936 |
{-2 ,1}, // 9 : down+left |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
937 |
{ 0, 0}, // 10 : impossible |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
938 |
{-2, 0}, // 11 : left + up + down = left |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
939 |
{ 2, 1}, // 12 : down+right |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
940 |
{ 0, 2}, // 13 : left + right + down = down |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
941 |
{ 0, -2}, // 14 : left + right + up = up |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4336
diff
changeset
|
942 |
{ 0, 0}, // 15 : impossible |
1397
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
943 |
}; |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
944 |
|
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
945 |
static void HandleKeyScrolling(void) |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
946 |
{ |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
947 |
if (_dirkeys && !_no_scroll) { |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
948 |
int factor = _shift_pressed ? 50 : 10; |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
949 |
ScrollMainViewport(scrollamt[_dirkeys][0] * factor, scrollamt[_dirkeys][1] * factor); |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
950 |
} |
b04402b901cd
(svn r1901) - Fix: unwanted behaviour of the savegame dialog, as well as a bug with a sloppy termination of a string. When any editbox is open, scrolling is disabled. If any new types of editboxes come up, please use SET/CLRBIT of _no_scroll with its unique identifier (ttd.h)
Darkvater
parents:
1385
diff
changeset
|
951 |
} |
1199
15d0c3424a45
(svn r1703) - Fix: Scrolling with the arrow keys is now smooth and it now also scrolls exactly in tile direction if e.g. up and left are pressed
dominik
parents:
1181
diff
changeset
|
952 |
|
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
953 |
void GameLoop(void) |
0 | 954 |
{ |
2380
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
955 |
ThreadMsg message; |
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
956 |
|
3b26659b4a9a
(svn r2906) Fix some threaded saving problems. Now the thread only interfaces with the main program through a sort of mutex. Communication uses the function OTTD_SendThreadMessage() with the approiate message which is handled in ProcessSentMessage() during the main loop.
Darkvater
parents:
2360
diff
changeset
|
957 |
if ((message = OTTD_PollThreadEvent()) != 0) ProcessSentMessage(message); |
0 | 958 |
|
959 |
// autosave game? |
|
960 |
if (_do_autosave) { |
|
961 |
_do_autosave = false; |
|
962 |
DoAutosave(); |
|
963 |
RedrawAutosave(); |
|
964 |
} |
|
965 |
||
1199
15d0c3424a45
(svn r1703) - Fix: Scrolling with the arrow keys is now smooth and it now also scrolls exactly in tile direction if e.g. up and left are pressed
dominik
parents:
1181
diff
changeset
|
966 |
// handle scrolling of the main window |
4502 | 967 |
HandleKeyScrolling(); |
1199
15d0c3424a45
(svn r1703) - Fix: Scrolling with the arrow keys is now smooth and it now also scrolls exactly in tile direction if e.g. up and left are pressed
dominik
parents:
1181
diff
changeset
|
968 |
|
0 | 969 |
// make a screenshot? |
4184
f38abcb8b18d
(svn r5626) CodeChange : Remove the global _make_screenshot and implement a more flexible mechanism
belugas
parents:
4171
diff
changeset
|
970 |
if (IsScreenshotRequested()) ShowScreenshotResult(MakeScreenshot()); |
0 | 971 |
|
972 |
// switch game mode? |
|
3024 | 973 |
if (_switch_mode != SM_NONE) { |
974 |
SwitchMode(_switch_mode); |
|
0 | 975 |
_switch_mode = SM_NONE; |
976 |
} |
|
977 |
||
978 |
IncreaseSpriteLRU(); |
|
979 |
InteractiveRandom(); |
|
980 |
||
2639 | 981 |
if (_scroller_click_timeout > 3) { |
0 | 982 |
_scroller_click_timeout -= 3; |
2639 | 983 |
} else { |
0 | 984 |
_scroller_click_timeout = 0; |
2639 | 985 |
} |
0 | 986 |
|
987 |
_caret_timer += 3; |
|
2639 | 988 |
_timer_counter += 8; |
0 | 989 |
CursorTick(); |
990 |
||
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
991 |
#ifdef ENABLE_NETWORK |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
992 |
// Check for UDP stuff |
4830
0ff2a14e90be
(svn r6754) -Codechange: Remove some #idef ENABLE_NETWORK specific defines. With networking
Darkvater
parents:
4829
diff
changeset
|
993 |
if (_network_available) NetworkUDPGameLoop(); |
0 | 994 |
|
4300
687a17c9c557
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
995 |
if (_networking && !IsGeneratingWorld()) { |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
996 |
// Multiplayer |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
997 |
NetworkGameLoop(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
998 |
} else { |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
999 |
if (_network_reconnect > 0 && --_network_reconnect == 0) { |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1000 |
// This means that we want to reconnect to the last host |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1001 |
// We do this here, because it means that the network is really closed |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1002 |
NetworkClientConnectGame(_network_last_host, _network_last_port); |
206 | 1003 |
} |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1004 |
// Singleplayer |
213
770e504a6e51
(svn r214) -Feature: CMD_NET_INSTANT [just in time command handling over network] (sign_de)
darkvater
parents:
208
diff
changeset
|
1005 |
StateGameLoop(); |
0 | 1006 |
} |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1007 |
#else |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1008 |
StateGameLoop(); |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1009 |
#endif /* ENABLE_NETWORK */ |
0 | 1010 |
|
2639 | 1011 |
if (!_pause && _display_opt & DO_FULL_ANIMATION) DoPaletteAnimations(); |
0 | 1012 |
|
2639 | 1013 |
if (!_pause || _cheats.build_in_pause.value) MoveAllTextEffects(); |
0 | 1014 |
|
1570
c470380facb9
(svn r2074) MouseLoop -> InputLoop(), factor out a real mouse-specific MouseLoop from the new InitLoop() (more in the spirit of HandleKeypress()).
pasky
parents:
1542
diff
changeset
|
1015 |
InputLoop(); |
0 | 1016 |
|
1608
074dff2e4890
(svn r2112) -Fix: ExtMidi no longer halts the game while starting a song
tron
parents:
1570
diff
changeset
|
1017 |
MusicLoop(); |
0 | 1018 |
} |
1019 |
||
1093
e8d26c7dc42f
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
tron
parents:
1036
diff
changeset
|
1020 |
void BeforeSaveGame(void) |
0 | 1021 |
{ |
4171 | 1022 |
const Window *w = FindWindowById(WC_MAIN_WINDOW, 0); |
0 | 1023 |
|
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:
961
diff
changeset
|
1024 |
if (w != NULL) { |
2643 | 1025 |
_saved_scrollpos_x = WP(w, const vp_d).scrollpos_x; |
1026 |
_saved_scrollpos_y = WP(w, const vp_d).scrollpos_y; |
|
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:
961
diff
changeset
|
1027 |
_saved_scrollpos_zoom = w->viewport->zoom; |
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:
961
diff
changeset
|
1028 |
} |
0 | 1029 |
} |
1030 |
||
1095 | 1031 |
static void ConvertTownOwner(void) |
0 | 1032 |
{ |
1977
4392ae3d8e31
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
tron
parents:
1962
diff
changeset
|
1033 |
TileIndex tile; |
0 | 1034 |
|
863
8d09f9331a80
(svn r1344) Use MapSize[XY]() (or MapSize()/MapMax[XY]() where appropriate) instead of TILES_[XY]
tron
parents:
861
diff
changeset
|
1035 |
for (tile = 0; tile != MapSize(); tile++) { |
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:
3984
diff
changeset
|
1036 |
switch (GetTileType(tile)) { |
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:
3984
diff
changeset
|
1037 |
case MP_STREET: |
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:
3984
diff
changeset
|
1038 |
if (IsLevelCrossing(tile) && GetCrossingRoadOwner(tile) & 0x80) { |
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:
3984
diff
changeset
|
1039 |
SetCrossingRoadOwner(tile, OWNER_TOWN); |
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:
3984
diff
changeset
|
1040 |
} |
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:
3984
diff
changeset
|
1041 |
/* FALLTHROUGH */ |
0 | 1042 |
|
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:
3984
diff
changeset
|
1043 |
case MP_TUNNELBRIDGE: |
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:
3984
diff
changeset
|
1044 |
if (GetTileOwner(tile) & 0x80) SetTileOwner(tile, OWNER_TOWN); |
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:
3984
diff
changeset
|
1045 |
break; |
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:
3984
diff
changeset
|
1046 |
|
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:
3984
diff
changeset
|
1047 |
default: break; |
0 | 1048 |
} |
1049 |
} |
|
1050 |
} |
|
1051 |
||
1052 |
// before savegame version 4, the name of the company determined if it existed |
|
1095 | 1053 |
static void CheckIsPlayerActive(void) |
0 | 1054 |
{ |
4171 | 1055 |
Player *p; |
2639 | 1056 |
|
0 | 1057 |
FOR_ALL_PLAYERS(p) { |
2639 | 1058 |
if (p->name_1 != 0) p->is_active = true; |
0 | 1059 |
} |
1060 |
} |
|
1061 |
||
121
c2f18f4d8be1
(svn r122) Change: exclusive transport rights are now stored per town instead of per station
dominik
parents:
116
diff
changeset
|
1062 |
// since savegame version 4.1, exclusive transport rights are stored at towns |
1095 | 1063 |
static void UpdateExclusiveRights(void) |
121
c2f18f4d8be1
(svn r122) Change: exclusive transport rights are now stored per town instead of per station
dominik
parents:
116
diff
changeset
|
1064 |
{ |
4171 | 1065 |
Town *t; |
2639 | 1066 |
|
1067 |
FOR_ALL_TOWNS(t) { |
|
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1068 |
t->exclusivity = (byte)-1; |
121
c2f18f4d8be1
(svn r122) Change: exclusive transport rights are now stored per town instead of per station
dominik
parents:
116
diff
changeset
|
1069 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1070 |
|
123
d550772c61e6
(svn r124) Prepared code for removal of block_months variable in next major savegame version
dominik
parents:
121
diff
changeset
|
1071 |
/* FIXME old exclusive rights status is not being imported (stored in s->blocked_months_obsolete) |
4549
60410aa1aa88
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1072 |
* could be implemented this way: |
60410aa1aa88
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1073 |
* 1.) Go through all stations |
60410aa1aa88
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1074 |
* Build an array town_blocked[ town_id ][ player_id ] |
60410aa1aa88
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1075 |
* that stores if at least one station in that town is blocked for a player |
60410aa1aa88
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1076 |
* 2.) Go through that array, if you find a town that is not blocked for |
60410aa1aa88
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1077 |
* one player, but for all others, then give him exclusivity. |
60410aa1aa88
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1078 |
*/ |
121
c2f18f4d8be1
(svn r122) Change: exclusive transport rights are now stored per town instead of per station
dominik
parents:
116
diff
changeset
|
1079 |
} |
c2f18f4d8be1
(svn r122) Change: exclusive transport rights are now stored per town instead of per station
dominik
parents:
116
diff
changeset
|
1080 |
|
2756 | 1081 |
static const byte convert_currency[] = { |
762
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1082 |
0, 1, 12, 8, 3, |
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1083 |
10, 14, 19, 4, 5, |
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1084 |
9, 11, 13, 6, 17, |
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1085 |
16, 22, 21, 7, 15, |
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1086 |
18, 2, 20, }; |
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1087 |
|
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1088 |
// since savegame version 4.2 the currencies are arranged differently |
1095 | 1089 |
static void UpdateCurrencies(void) |
762
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1090 |
{ |
768
deb40d3554a2
(svn r1233) Fixed several currency issues. Now currencies should work correctly again.
dominik
parents:
762
diff
changeset
|
1091 |
_opt.currency = convert_currency[_opt.currency]; |
762
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1092 |
} |
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1093 |
|
1181
6231b823d796
(svn r1683) Fix placement of MP_VOID tiles. On square maps it accidently works, but on non-square maps the wrong tiles would get marked as MP_VOID
tron
parents:
1165
diff
changeset
|
1094 |
/* Up to revision 1413 the invisible tiles at the southern border have not been |
6231b823d796
(svn r1683) Fix placement of MP_VOID tiles. On square maps it accidently works, but on non-square maps the wrong tiles would get marked as MP_VOID
tron
parents:
1165
diff
changeset
|
1095 |
* MP_VOID, even though they should have. This is fixed by this function |
6231b823d796
(svn r1683) Fix placement of MP_VOID tiles. On square maps it accidently works, but on non-square maps the wrong tiles would get marked as MP_VOID
tron
parents:
1165
diff
changeset
|
1096 |
*/ |
1095 | 1097 |
static void UpdateVoidTiles(void) |
929
1a071a06af3f
(svn r1417) Fix: The invisible tiles on the southern border are now converted to class MP_VOID when an old map (with wrong classified invisible tiles) is loaded.
dominik
parents:
921
diff
changeset
|
1098 |
{ |
959
b031d88c76f3
(svn r1451) Fix some of the signed/unsigned comparison warnings
tron
parents:
950
diff
changeset
|
1099 |
uint i; |
1181
6231b823d796
(svn r1683) Fix placement of MP_VOID tiles. On square maps it accidently works, but on non-square maps the wrong tiles would get marked as MP_VOID
tron
parents:
1165
diff
changeset
|
1100 |
|
3075
f0d692c60465
(svn r3664) Add a function to turn a tile into a void tile
tron
parents:
3059
diff
changeset
|
1101 |
for (i = 0; i < MapMaxY(); ++i) MakeVoid(i * MapSizeX() + MapMaxX()); |
f0d692c60465
(svn r3664) Add a function to turn a tile into a void tile
tron
parents:
3059
diff
changeset
|
1102 |
for (i = 0; i < MapSizeX(); ++i) MakeVoid(MapSizeX() * MapMaxY() + i); |
929
1a071a06af3f
(svn r1417) Fix: The invisible tiles on the southern border are now converted to class MP_VOID when an old map (with wrong classified invisible tiles) is loaded.
dominik
parents:
921
diff
changeset
|
1103 |
} |
1a071a06af3f
(svn r1417) Fix: The invisible tiles on the southern border are now converted to class MP_VOID when an old map (with wrong classified invisible tiles) is loaded.
dominik
parents:
921
diff
changeset
|
1104 |
|
1165
2cdf7a0e217a
(svn r1667) - Feature: Signs are now shown in the color of the player who created them
dominik
parents:
1115
diff
changeset
|
1105 |
// since savegame version 6.0 each sign has an "owner", signs without owner (from old games are set to 255) |
2cdf7a0e217a
(svn r1667) - Feature: Signs are now shown in the color of the player who created them
dominik
parents:
1115
diff
changeset
|
1106 |
static void UpdateSignOwner(void) |
2cdf7a0e217a
(svn r1667) - Feature: Signs are now shown in the color of the player who created them
dominik
parents:
1115
diff
changeset
|
1107 |
{ |
4349
2fc39ff2626e
(svn r6050) -Codechange: mass-renamed SignStruct -> Sign and ss -> si. Now functions and variables all match eachother
truelight
parents:
4346
diff
changeset
|
1108 |
Sign *si; |
2639 | 1109 |
|
4349
2fc39ff2626e
(svn r6050) -Codechange: mass-renamed SignStruct -> Sign and ss -> si. Now functions and variables all match eachother
truelight
parents:
4346
diff
changeset
|
1110 |
FOR_ALL_SIGNS(si) si->owner = OWNER_NONE; |
1165
2cdf7a0e217a
(svn r1667) - Feature: Signs are now shown in the color of the player who created them
dominik
parents:
1115
diff
changeset
|
1111 |
} |
2cdf7a0e217a
(svn r1667) - Feature: Signs are now shown in the color of the player who created them
dominik
parents:
1115
diff
changeset
|
1112 |
|
950
1f6546ea35a3
(svn r1440) -Feature: Allows more flexible airport layouts now, as the number of
celestar
parents:
942
diff
changeset
|
1113 |
extern void UpdateOldAircraft( void ); |
1f6546ea35a3
(svn r1440) -Feature: Allows more flexible airport layouts now, as the number of
celestar
parents:
942
diff
changeset
|
1114 |
extern void UpdateOilRig( void ); |
0 | 1115 |
|
3656
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1116 |
|
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1117 |
static inline RailType UpdateRailType(RailType rt, RailType min) |
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1118 |
{ |
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1119 |
return rt >= min ? (RailType)(rt + 1): rt; |
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1120 |
} |
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1121 |
|
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1122 |
|
2808
35e0e9c6c227
(svn r3356) - Remove unused parameter of AfterLoadGame().
peter1138
parents:
2805
diff
changeset
|
1123 |
bool AfterLoadGame(void) |
0 | 1124 |
{ |
1125 |
Window *w; |
|
1126 |
ViewPort *vp; |
|
2147
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2100
diff
changeset
|
1127 |
Player *p; |
988
2482369a61ff
(svn r1486) -Codechange: moved all 'signs' stuff to signs.c/h and prepared it for
truelight
parents:
983
diff
changeset
|
1128 |
|
0 | 1129 |
// in version 2.1 of the savegame, town owner was unified. |
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1130 |
if (CheckSavegameVersionOldStyle(2, 1)) ConvertTownOwner(); |
0 | 1131 |
|
121
c2f18f4d8be1
(svn r122) Change: exclusive transport rights are now stored per town instead of per station
dominik
parents:
116
diff
changeset
|
1132 |
// from version 4.1 of the savegame, exclusive rights are stored at towns |
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1133 |
if (CheckSavegameVersionOldStyle(4, 1)) UpdateExclusiveRights(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1134 |
|
762
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1135 |
// from version 4.2 of the savegame, currencies are in a different order |
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1136 |
if (CheckSavegameVersionOldStyle(4, 2)) UpdateCurrencies(); |
762
7afe6c8554cb
(svn r1222) Currency cleanup. Changed some currency symbols according to forum suggestions (thx ChrisCF) and rearranged the currencies alphabetically (except for the major ones).
dominik
parents:
760
diff
changeset
|
1137 |
|
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1138 |
// from version 6.1 of the savegame, signs have an "owner" |
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1139 |
if (CheckSavegameVersionOldStyle(6, 1)) UpdateSignOwner(); |
1165
2cdf7a0e217a
(svn r1667) - Feature: Signs are now shown in the color of the player who created them
dominik
parents:
1115
diff
changeset
|
1140 |
|
831
f1cee10e3422
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1141 |
/* In old version there seems to be a problem that water is owned by |
f1cee10e3422
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1142 |
OWNER_NONE, not OWNER_WATER.. I can't replicate it for the current |
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1143 |
(4.3) version, so I just check when versions are older, and then |
831
f1cee10e3422
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1144 |
walk through the whole map.. */ |
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1145 |
if (CheckSavegameVersionOldStyle(4, 3)) { |
1981 | 1146 |
TileIndex tile = TileXY(0, 0); |
831
f1cee10e3422
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1147 |
uint w = MapSizeX(); |
f1cee10e3422
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1148 |
uint h = MapSizeY(); |
f1cee10e3422
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1149 |
|
f1cee10e3422
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1150 |
BEGIN_TILE_LOOP(tile_cur, w, h, 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
|
1151 |
if (IsTileType(tile_cur, MP_WATER) && GetTileOwner(tile_cur) >= MAX_PLAYERS) |
1902 | 1152 |
SetTileOwner(tile_cur, OWNER_WATER); |
831
f1cee10e3422
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1153 |
END_TILE_LOOP(tile_cur, w, h, tile) |
f1cee10e3422
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1154 |
} |
f1cee10e3422
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1155 |
|
0 | 1156 |
// convert road side to my format. |
1157 |
if (_opt.road_side) _opt.road_side = 1; |
|
1158 |
||
5228
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
1159 |
/* Check all NewGRFs are present */ |
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
1160 |
if (!IsGoodGRFConfigList()) return false; |
c4a780348f66
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
1161 |
|
0 | 1162 |
// Load the sprites |
1163 |
GfxLoadSprites(); |
|
5155
64f930853bea
(svn r7250) -Codechange: Shuffle sprite loading and character width caching around a bit. This reduces the number of times the sprites are loaded from 5 to 2, just for the intro game.
peter1138
parents:
5116
diff
changeset
|
1164 |
LoadStringWidthTable(); |
0 | 1165 |
|
2814
0f534d66544e
(svn r3362) Fix issue with loading old (TTD) savegames:
peter1138
parents:
2808
diff
changeset
|
1166 |
/* Connect front and rear engines of multiheaded trains and converts |
0f534d66544e
(svn r3362) Fix issue with loading old (TTD) savegames:
peter1138
parents:
2808
diff
changeset
|
1167 |
* subtype to the new format */ |
0f534d66544e
(svn r3362) Fix issue with loading old (TTD) savegames:
peter1138
parents:
2808
diff
changeset
|
1168 |
if (CheckSavegameVersionOldStyle(17, 1)) ConvertOldMultiheadToNew(); |
0f534d66544e
(svn r3362) Fix issue with loading old (TTD) savegames:
peter1138
parents:
2808
diff
changeset
|
1169 |
|
2928
414b96d4d4fb
(svn r3484) -fix: fixed issue in last commit where loading savegame versions 18 and 19 didn't init the multiheaded engine pointers
bjarni
parents:
2916
diff
changeset
|
1170 |
/* Connect front and rear engines of multiheaded trains */ |
414b96d4d4fb
(svn r3484) -fix: fixed issue in last commit where loading savegame versions 18 and 19 didn't init the multiheaded engine pointers
bjarni
parents:
2916
diff
changeset
|
1171 |
ConnectMultiheadedTrains(); |
2855
950b5a56f9d5
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2848
diff
changeset
|
1172 |
|
0 | 1173 |
// Update current year |
1174 |
SetDate(_date); |
|
1175 |
||
1176 |
// reinit the landscape variables (landscape might have changed) |
|
1177 |
InitializeLandscapeVariables(true); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1178 |
|
0 | 1179 |
// Update all vehicles |
1180 |
AfterLoadVehicles(); |
|
1542
2ca6d1624e6d
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1501
diff
changeset
|
1181 |
|
2ca6d1624e6d
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1501
diff
changeset
|
1182 |
// Update all waypoints |
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1183 |
if (CheckSavegameVersion(12)) FixOldWaypoints(); |
1542
2ca6d1624e6d
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1501
diff
changeset
|
1184 |
|
2ca6d1624e6d
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1501
diff
changeset
|
1185 |
UpdateAllWaypointSigns(); |
2ca6d1624e6d
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1501
diff
changeset
|
1186 |
|
0 | 1187 |
// in version 2.2 of the savegame, we have new airports |
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1188 |
if (CheckSavegameVersionOldStyle(2, 2)) UpdateOldAircraft(); |
0 | 1189 |
|
1190 |
UpdateAllStationVirtCoord(); |
|
1191 |
||
1192 |
// Setup town coords |
|
1193 |
AfterLoadTown(); |
|
1194 |
UpdateAllSignVirtCoords(); |
|
1195 |
||
1196 |
// make sure there is a town in the game |
|
2639 | 1197 |
if (_game_mode == GM_NORMAL && !ClosestTownFromTile(0, (uint)-1)) { |
0 | 1198 |
_error_message = STR_NO_TOWN_IN_SCENARIO; |
1199 |
return false; |
|
1200 |
} |
|
1201 |
||
1202 |
// Initialize windows |
|
1474
d83520edcda6
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
1203 |
ResetWindowSystem(); |
0 | 1204 |
SetupColorsAndInitialWindow(); |
1205 |
||
1206 |
w = FindWindowById(WC_MAIN_WINDOW, 0); |
|
1207 |
||
1208 |
WP(w,vp_d).scrollpos_x = _saved_scrollpos_x; |
|
1209 |
WP(w,vp_d).scrollpos_y = _saved_scrollpos_y; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1210 |
|
0 | 1211 |
vp = w->viewport; |
1212 |
vp->zoom = _saved_scrollpos_zoom; |
|
1213 |
vp->virtual_width = vp->width << vp->zoom; |
|
1214 |
vp->virtual_height = vp->height << vp->zoom; |
|
1215 |
||
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1216 |
// in version 4.1 of the savegame, is_active was introduced to determine |
0 | 1217 |
// if a player does exist, rather then checking name_1 |
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1218 |
if (CheckSavegameVersionOldStyle(4, 1)) CheckIsPlayerActive(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1219 |
|
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1220 |
// the void tiles on the southern border used to belong to a wrong class (pre 4.3). |
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1221 |
if (CheckSavegameVersionOldStyle(4, 3)) UpdateVoidTiles(); |
929
1a071a06af3f
(svn r1417) Fix: The invisible tiles on the southern border are now converted to class MP_VOID when an old map (with wrong classified invisible tiles) is loaded.
dominik
parents:
921
diff
changeset
|
1222 |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1223 |
// If Load Scenario / New (Scenario) Game is used, |
139 | 1224 |
// a player does not exist yet. So create one here. |
543
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1225 |
// 1 exeption: network-games. Those can have 0 players |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1226 |
// But this exeption is not true for network_servers! |
e3b43338096b
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1227 |
if (!_players[0].is_active && (!_networking || (_networking && _network_server))) |
139 | 1228 |
DoStartupNewPlayer(false); |
0 | 1229 |
|
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
139
diff
changeset
|
1230 |
DoZoomInOutWindow(ZOOM_NONE, w); // update button status |
0 | 1231 |
MarkWholeScreenDirty(); |
1232 |
||
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1233 |
// In 5.1, Oilrigs have been moved (again) |
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1234 |
if (CheckSavegameVersionOldStyle(5, 1)) UpdateOilRig(); |
950
1f6546ea35a3
(svn r1440) -Feature: Allows more flexible airport layouts now, as the number of
celestar
parents:
942
diff
changeset
|
1235 |
|
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1236 |
/* In version 6.1 we put the town index in the map-array. To do this, we need |
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1237 |
* to use m2 (16bit big), so we need to clean m2, and that is where this is |
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1238 |
* all about ;) */ |
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1239 |
if (CheckSavegameVersionOldStyle(6, 1)) { |
1264
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1260
diff
changeset
|
1240 |
BEGIN_TILE_LOOP(tile, MapSizeX(), MapSizeY(), 0) { |
3983
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1241 |
switch (GetTileType(tile)) { |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1242 |
case MP_HOUSE: |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1243 |
_m[tile].m4 = _m[tile].m2; |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1244 |
SetTownIndex(tile, CalcClosestTownFromTile(tile, (uint)-1)->index); |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1245 |
break; |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1246 |
|
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1247 |
case MP_STREET: |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1248 |
_m[tile].m4 |= (_m[tile].m2 << 4); |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1249 |
if (IsTileOwner(tile, OWNER_TOWN)) { |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1250 |
SetTownIndex(tile, CalcClosestTownFromTile(tile, (uint)-1)->index); |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1251 |
} else { |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1252 |
SetTownIndex(tile, 0); |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1253 |
} |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1254 |
break; |
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1255 |
|
d2d6496238e4
(svn r5171) Get rid of an ungly hack in the load routine, which temporarily turned house and road tiles into void tiles to calculate the closest town
tron
parents:
3977
diff
changeset
|
1256 |
default: break; |
1264
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1260
diff
changeset
|
1257 |
} |
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1260
diff
changeset
|
1258 |
} END_TILE_LOOP(tile, MapSizeX(), MapSizeY(), 0); |
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1260
diff
changeset
|
1259 |
} |
280792016b02
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1260
diff
changeset
|
1260 |
|
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1261 |
/* From version 9.0, we update the max passengers of a town (was sometimes negative |
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1262 |
* before that. */ |
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1263 |
if (CheckSavegameVersion(9)) { |
1377
2a418162176e
(svn r1881) -Fix: [ 1119308 ] Max passengers / mail variables are now 32 bit
celestar
parents:
1349
diff
changeset
|
1264 |
Town *t; |
2639 | 1265 |
FOR_ALL_TOWNS(t) UpdateTownMaxPass(t); |
1377
2a418162176e
(svn r1881) -Fix: [ 1119308 ] Max passengers / mail variables are now 32 bit
celestar
parents:
1349
diff
changeset
|
1266 |
} |
2a418162176e
(svn r1881) -Fix: [ 1119308 ] Max passengers / mail variables are now 32 bit
celestar
parents:
1349
diff
changeset
|
1267 |
|
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1268 |
/* From version 16.0, we included autorenew on engines, which are now saved, but |
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1269 |
* of course, we do need to initialize them for older savegames. */ |
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1270 |
if (CheckSavegameVersion(16)) { |
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
1271 |
FOR_ALL_PLAYERS(p) { |
2848 | 1272 |
p->engine_renew_list = NULL; |
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
1273 |
p->engine_renew = false; |
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
1274 |
p->engine_renew_months = -6; |
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
1275 |
p->engine_renew_money = 100000; |
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
1276 |
} |
4850
b4e9be22945f
(svn r6776) -Codechange: Use IsValidPlayer() function to determine of a PlayerID is an
Darkvater
parents:
4848
diff
changeset
|
1277 |
if (IsValidPlayer(_local_player)) { |
2322
962f8825ff6b
(svn r2848) -Fix: [ 1256044 ] fixed crash when loading a map made before rev 2817 in scenario editor. This was introduced in 2817
bjarni
parents:
2297
diff
changeset
|
1278 |
// Set the human controlled player to the patch settings |
962f8825ff6b
(svn r2848) -Fix: [ 1256044 ] fixed crash when loading a map made before rev 2817 in scenario editor. This was introduced in 2817
bjarni
parents:
2297
diff
changeset
|
1279 |
// Scenario editor do not have any companies |
962f8825ff6b
(svn r2848) -Fix: [ 1256044 ] fixed crash when loading a map made before rev 2817 in scenario editor. This was introduced in 2817
bjarni
parents:
2297
diff
changeset
|
1280 |
p = GetPlayer(_local_player); |
962f8825ff6b
(svn r2848) -Fix: [ 1256044 ] fixed crash when loading a map made before rev 2817 in scenario editor. This was introduced in 2817
bjarni
parents:
2297
diff
changeset
|
1281 |
p->engine_renew = _patches.autorenew; |
962f8825ff6b
(svn r2848) -Fix: [ 1256044 ] fixed crash when loading a map made before rev 2817 in scenario editor. This was introduced in 2817
bjarni
parents:
2297
diff
changeset
|
1282 |
p->engine_renew_months = _patches.autorenew_months; |
962f8825ff6b
(svn r2848) -Fix: [ 1256044 ] fixed crash when loading a map made before rev 2817 in scenario editor. This was introduced in 2817
bjarni
parents:
2297
diff
changeset
|
1283 |
p->engine_renew_money = _patches.autorenew_money; |
962f8825ff6b
(svn r2848) -Fix: [ 1256044 ] fixed crash when loading a map made before rev 2817 in scenario editor. This was introduced in 2817
bjarni
parents:
2297
diff
changeset
|
1284 |
} |
2293
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
1285 |
} |
a71c210076be
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
1286 |
|
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1287 |
/* Elrails got added in rev 24 */ |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1288 |
if (CheckSavegameVersion(24)) { |
4171 | 1289 |
Vehicle *v; |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1290 |
uint i; |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1291 |
TileIndex t; |
3656
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1292 |
RailType min_rail = RAILTYPE_ELECTRIC; |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1293 |
|
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1294 |
for (i = 0; i < lengthof(_engines); i++) { |
4171 | 1295 |
Engine *e = GetEngine(i); |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1296 |
if (e->type == VEH_Train && |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1297 |
(e->railtype != RAILTYPE_RAIL || RailVehInfo(i)->engclass == 2)) { |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1298 |
e->railtype++; |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1299 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1300 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1301 |
|
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1302 |
FOR_ALL_VEHICLES(v) { |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1303 |
if (v->type == VEH_Train) { |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1304 |
RailType rt = GetEngine(v->engine_type)->railtype; |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1305 |
|
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1306 |
v->u.rail.railtype = rt; |
3656
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1307 |
if (rt == RAILTYPE_ELECTRIC) min_rail = RAILTYPE_RAIL; |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1308 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1309 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1310 |
|
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1311 |
/* .. so we convert the entire map from normal to elrail (so maintain "fairness") */ |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1312 |
for (t = 0; t < MapSize(); t++) { |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1313 |
switch (GetTileType(t)) { |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1314 |
case MP_RAILWAY: |
3656
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1315 |
SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1316 |
break; |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1317 |
|
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1318 |
case MP_STREET: |
3656
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1319 |
if (IsLevelCrossing(t)) { |
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1320 |
SetRailTypeCrossing(t, UpdateRailType(GetRailTypeCrossing(t), min_rail)); |
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1321 |
} |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1322 |
break; |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1323 |
|
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1324 |
case MP_STATION: |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
1325 |
if (IsRailwayStation(t)) { |
3656
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1326 |
SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1327 |
} |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1328 |
break; |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1329 |
|
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1330 |
case MP_TUNNELBRIDGE: |
3367 | 1331 |
if (IsTunnel(t)) { |
1332 |
if (GetTunnelTransportType(t) == TRANSPORT_RAIL) { |
|
3656
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1333 |
SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1334 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1335 |
} else { |
3367 | 1336 |
if (GetBridgeTransportType(t) == TRANSPORT_RAIL) { |
3977
edb5b94e2094
(svn r5155) - Remove the bridge branch merge (revision r5070)
tron
parents:
3933
diff
changeset
|
1337 |
if (IsBridgeRamp(t)) { |
edb5b94e2094
(svn r5155) - Remove the bridge branch merge (revision r5070)
tron
parents:
3933
diff
changeset
|
1338 |
SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
edb5b94e2094
(svn r5155) - Remove the bridge branch merge (revision r5070)
tron
parents:
3933
diff
changeset
|
1339 |
} else { |
edb5b94e2094
(svn r5155) - Remove the bridge branch merge (revision r5070)
tron
parents:
3933
diff
changeset
|
1340 |
SetRailTypeOnBridge(t, UpdateRailType(GetRailTypeOnBridge(t), min_rail)); |
edb5b94e2094
(svn r5155) - Remove the bridge branch merge (revision r5070)
tron
parents:
3933
diff
changeset
|
1341 |
} |
edb5b94e2094
(svn r5155) - Remove the bridge branch merge (revision r5070)
tron
parents:
3933
diff
changeset
|
1342 |
} |
edb5b94e2094
(svn r5155) - Remove the bridge branch merge (revision r5070)
tron
parents:
3933
diff
changeset
|
1343 |
if (IsBridgeMiddle(t) && |
edb5b94e2094
(svn r5155) - Remove the bridge branch merge (revision r5070)
tron
parents:
3933
diff
changeset
|
1344 |
IsTransportUnderBridge(t) && |
edb5b94e2094
(svn r5155) - Remove the bridge branch merge (revision r5070)
tron
parents:
3933
diff
changeset
|
1345 |
GetTransportTypeUnderBridge(t) == TRANSPORT_RAIL) { |
3656
4e75522d698d
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1346 |
SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
3355
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1347 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1348 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1349 |
break; |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1350 |
|
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1351 |
default: |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1352 |
break; |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1353 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1354 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1355 |
|
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1356 |
FOR_ALL_VEHICLES(v) { |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1357 |
if (v->type == VEH_Train && (IsFrontEngine(v) || IsFreeWagon(v))) TrainConsistChanged(v); |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1358 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1359 |
|
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1360 |
} |
a653b8e47f27
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
celestar
parents:
3312
diff
changeset
|
1361 |
|
2805
b6098e7ca457
(svn r3353) Simplify the automatic length adjustment algorithm for replacing trains: Use the length of the train before the replacement as reference length
tron
parents:
2769
diff
changeset
|
1362 |
/* In version 16.1 of the savegame a player can decide if trains, which get |
b6098e7ca457
(svn r3353) Simplify the automatic length adjustment algorithm for replacing trains: Use the length of the train before the replacement as reference length
tron
parents:
2769
diff
changeset
|
1363 |
* replaced, shall keep their old length. In all prior versions, just default |
b6098e7ca457
(svn r3353) Simplify the automatic length adjustment algorithm for replacing trains: Use the length of the train before the replacement as reference length
tron
parents:
2769
diff
changeset
|
1364 |
* to false */ |
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1365 |
if (CheckSavegameVersionOldStyle(16, 1)) { |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
1366 |
FOR_ALL_PLAYERS(p) p->renew_keep_length = false; |
2617
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2572
diff
changeset
|
1367 |
} |
a9e1a187de99
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2572
diff
changeset
|
1368 |
|
2670
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1369 |
/* In version 17, ground type is moved from m2 to m4 for depots and |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1370 |
* waypoints to make way for storing the index in m2. The custom graphics |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1371 |
* id which was stored in m4 is now saved as a grf/id reference in the |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1372 |
* waypoint struct. */ |
2685
00111d5ca47f
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1373 |
if (CheckSavegameVersion(17)) { |
2670
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1374 |
Waypoint *wp; |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1375 |
|
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1376 |
FOR_ALL_WAYPOINTS(wp) { |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1377 |
if (wp->deleted == 0) { |
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3656
diff
changeset
|
1378 |
const StationSpec *statspec = NULL; |
2670
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1379 |
|
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1380 |
if (HASBIT(_m[wp->xy].m3, 4)) |
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3656
diff
changeset
|
1381 |
statspec = GetCustomStationSpec(STAT_CLASS_WAYP, _m[wp->xy].m4 + 1); |
2670
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1382 |
|
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3656
diff
changeset
|
1383 |
if (statspec != NULL) { |
2670
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1384 |
wp->stat_id = _m[wp->xy].m4 + 1; |
3676
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3656
diff
changeset
|
1385 |
wp->grfid = statspec->grfid; |
48444d881fbe
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3656
diff
changeset
|
1386 |
wp->localidx = statspec->localidx; |
2670
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1387 |
} else { |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1388 |
// No custom graphics set, so set to default. |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1389 |
wp->stat_id = 0; |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1390 |
wp->grfid = 0; |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1391 |
wp->localidx = 0; |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1392 |
} |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1393 |
|
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1394 |
// Move ground type bits from m2 to m4. |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1395 |
_m[wp->xy].m4 = GB(_m[wp->xy].m2, 0, 4); |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1396 |
// Store waypoint index in the tile. |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1397 |
_m[wp->xy].m2 = wp->index; |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1398 |
} |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1399 |
} |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1400 |
} else { |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1401 |
/* As of version 17, we recalculate the custom graphic ID of waypoints |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1402 |
* from the GRF ID / station index. */ |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1403 |
UpdateAllWaypointCustomGraphics(); |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1404 |
} |
34970983ef08
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
peter1138
parents:
2649
diff
changeset
|
1405 |
|
2916
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1406 |
/* From version 15, we moved a semaphore bit from bit 2 to bit 3 in m4, making |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1407 |
* room for PBS. Now in version 21 move it back :P. */ |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1408 |
if (CheckSavegameVersion(21) && !CheckSavegameVersion(15)) { |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1409 |
BEGIN_TILE_LOOP(tile, MapSizeX(), MapSizeY(), 0) { |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1410 |
if (IsTileType(tile, MP_RAILWAY)) { |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1411 |
if (HasSignals(tile)) { |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1412 |
// convert PBS signals to combo-signals |
3984
80b50f16d352
(svn r5173) Use map manipulation functions instead of SB()
tron
parents:
3983
diff
changeset
|
1413 |
if (HASBIT(_m[tile].m4, 2)) SetSignalType(tile, SIGTYPE_COMBO); |
2916
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1414 |
|
3984
80b50f16d352
(svn r5173) Use map manipulation functions instead of SB()
tron
parents:
3983
diff
changeset
|
1415 |
// move the signal variant back |
80b50f16d352
(svn r5173) Use map manipulation functions instead of SB()
tron
parents:
3983
diff
changeset
|
1416 |
SetSignalVariant(tile, HASBIT(_m[tile].m4, 3) ? SIG_SEMAPHORE : SIG_ELECTRIC); |
2916
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1417 |
CLRBIT(_m[tile].m4, 3); |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1418 |
} |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1419 |
|
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1420 |
// Clear PBS reservation on track |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
1421 |
if (!IsTileDepotType(tile, TRANSPORT_RAIL)) { |
2916
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1422 |
SB(_m[tile].m4, 4, 4, 0); |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
1423 |
} else { |
2916
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1424 |
CLRBIT(_m[tile].m3, 6); |
4077
d3022f976946
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
1425 |
} |
2916
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1426 |
} |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1427 |
|
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1428 |
// Clear PBS reservation on crossing |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1429 |
if (IsTileType(tile, MP_STREET) && IsLevelCrossing(tile)) |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1430 |
CLRBIT(_m[tile].m5, 0); |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1431 |
|
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1432 |
// Clear PBS reservation on station |
2929
f54492d3dea8
(svn r3485) - [Post-PBS]: when reverting PBS and removing station-tile reservations a station can of course not be a crossing as well. Thanks glx.
Darkvater
parents:
2928
diff
changeset
|
1433 |
if (IsTileType(tile, MP_STATION)) |
2916
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1434 |
CLRBIT(_m[tile].m3, 6); |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1435 |
} END_TILE_LOOP(tile, MapSizeX(), MapSizeY(), 0); |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1436 |
} |
8f1aa489701f
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
Darkvater
parents:
2899
diff
changeset
|
1437 |
|
3121
2e50f731567a
(svn r3726) - [6/6] Finalize conversion, finally save the patches struct.
Darkvater
parents:
3075
diff
changeset
|
1438 |
if (CheckSavegameVersion(22)) UpdatePatches(); |
2e50f731567a
(svn r3726) - [6/6] Finalize conversion, finally save the patches struct.
Darkvater
parents:
3075
diff
changeset
|
1439 |
|
3431 | 1440 |
if (CheckSavegameVersion(25)) { |
1441 |
Vehicle *v; |
|
1442 |
FOR_ALL_VEHICLES(v) { |
|
1443 |
if (v->type == VEH_Road) { |
|
1444 |
v->vehstatus &= ~0x40; |
|
1445 |
v->u.road.slot = NULL; |
|
1446 |
v->u.road.slot_age = 0; |
|
1447 |
} |
|
1448 |
} |
|
1449 |
} |
|
1450 |
||
3580
607e4245d024
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1451 |
if (CheckSavegameVersion(26)) { |
607e4245d024
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1452 |
Station *st; |
607e4245d024
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1453 |
FOR_ALL_STATIONS(st) { |
607e4245d024
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1454 |
st->last_vehicle_type = VEH_Invalid; |
607e4245d024
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1455 |
} |
607e4245d024
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1456 |
} |
607e4245d024
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1457 |
|
3900
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3891
diff
changeset
|
1458 |
YapfNotifyTrackLayoutChange(INVALID_TILE, INVALID_TRACK); |
4984308f9125
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3891
diff
changeset
|
1459 |
|
4603
3ccd4ee0a2e2
(svn r6455) - Feature: Add 2cc (two company colours) livery schemes. This replaces the original colour selection window and bumps the saveload version. Liveries are supported for all vehicles, not just those with 2cc support. Thanks to lakie for GUI inspiration.
peter1138
parents:
4574
diff
changeset
|
1460 |
if (CheckSavegameVersion(34)) FOR_ALL_PLAYERS(p) ResetPlayerLivery(p); |
3ccd4ee0a2e2
(svn r6455) - Feature: Add 2cc (two company colours) livery schemes. This replaces the original colour selection window and bumps the saveload version. Liveries are supported for all vehicles, not just those with 2cc support. Thanks to lakie for GUI inspiration.
peter1138
parents:
4574
diff
changeset
|
1461 |
|
2639 | 1462 |
FOR_ALL_PLAYERS(p) p->avail_railtypes = GetPlayerRailtypes(p->index); |
2147
42efdf5020d1
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2100
diff
changeset
|
1463 |
|
3765
e057e2b740d4
(svn r4757) - Newstations: add saveload support for custom station speclists
peter1138
parents:
3678
diff
changeset
|
1464 |
if (!CheckSavegameVersion(27)) AfterLoadStations(); |
e057e2b740d4
(svn r4757) - Newstations: add saveload support for custom station speclists
peter1138
parents:
3678
diff
changeset
|
1465 |
|
4574
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1466 |
{ |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1467 |
/* Set up the engine count for all players */ |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1468 |
Player *players[MAX_PLAYERS]; |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1469 |
int i; |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1470 |
const Vehicle *v; |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1471 |
|
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1472 |
for (i = 0; i < MAX_PLAYERS; i++) players[i] = GetPlayer(i); |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1473 |
|
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1474 |
FOR_ALL_VEHICLES(v) { |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1475 |
if (!IsEngineCountable(v)) continue; |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1476 |
players[v->owner]->num_engines[v->engine_type]++; |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1477 |
} |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1478 |
} |
497540b4a75f
(svn r6424) -Codechange: [autoreplace] removed a loop though all vehicles from each time the window is redrawn
bjarni
parents:
4549
diff
changeset
|
1479 |
|
4326
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1480 |
/* Time starts at 0 instead of 1920. |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1481 |
* Account for this in older games by adding an offset */ |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1482 |
if (CheckSavegameVersion(31)) { |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1483 |
Station *st; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1484 |
Waypoint *wp; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1485 |
Engine *e; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1486 |
Player *player; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1487 |
Industry *i; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1488 |
Vehicle *v; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1489 |
|
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1490 |
_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
4383
3dcf52b1efd9
(svn r6136) -Fix: _cur_year wasn't converting when reading pre-31 savegames, causing nasty desyncs
truelight
parents:
4349
diff
changeset
|
1491 |
_cur_year += ORIGINAL_BASE_YEAR; |
4326
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1492 |
|
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1493 |
FOR_ALL_STATIONS(st) st->build_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1494 |
FOR_ALL_WAYPOINTS(wp) wp->build_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1495 |
FOR_ALL_ENGINES(e) e->intro_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1496 |
FOR_ALL_PLAYERS(player) player->inaugurated_year += ORIGINAL_BASE_YEAR; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1497 |
FOR_ALL_INDUSTRIES(i) i->last_prod_year += ORIGINAL_BASE_YEAR; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1498 |
|
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1499 |
FOR_ALL_VEHICLES(v) { |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1500 |
v->date_of_last_service += DAYS_TILL_ORIGINAL_BASE_YEAR; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1501 |
v->build_year += ORIGINAL_BASE_YEAR; |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1502 |
} |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1503 |
} |
c2ae4dbc1074
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1504 |
|
4328
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1505 |
/* From 32 on we save the industry who made the farmland. |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1506 |
* To give this prettyness to old savegames, we remove all farmfields and |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1507 |
* plant new ones. */ |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1508 |
if (CheckSavegameVersion(32)) { |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1509 |
Industry *i; |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1510 |
|
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1511 |
BEGIN_TILE_LOOP(tile_cur, MapSizeX(), MapSizeY(), 0) { |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1512 |
if (IsTileType(tile_cur, MP_CLEAR) && IsClearGround(tile_cur, CLEAR_FIELDS)) { |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1513 |
MakeClear(tile_cur, CLEAR_GRASS, 3); |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1514 |
} |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1515 |
} END_TILE_LOOP(tile_cur, MapSizeX(), MapSizeY(), 0) |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1516 |
|
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1517 |
FOR_ALL_INDUSTRIES(i) { |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1518 |
uint j; |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1519 |
|
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1520 |
if (i->type == IT_FARM || i->type == IT_FARM_2) { |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1521 |
for (j = 0; j != 50; j++) PlantRandomFarmField(i); |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1522 |
} |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1523 |
} |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1524 |
} |
23dd79414386
(svn r6001) -Feature: when removing a farm, his farmland is removed too (over time) (based on peter1138's patch, FS#82)
truelight
parents:
4326
diff
changeset
|
1525 |
|
4712
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1526 |
/* Setting no refit flags to all orders in savegames from before refit in orders were added */ |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1527 |
if (CheckSavegameVersion(36)) { |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1528 |
Order *order; |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1529 |
Vehicle *v; |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1530 |
|
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1531 |
FOR_ALL_ORDERS(order) { |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1532 |
order->refit_cargo = CT_NO_REFIT; |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1533 |
order->refit_subtype = CT_NO_REFIT; |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1534 |
} |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1535 |
|
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1536 |
FOR_ALL_VEHICLES(v) { |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1537 |
v->current_order.refit_cargo = CT_NO_REFIT; |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1538 |
v->current_order.refit_subtype = CT_NO_REFIT; |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1539 |
} |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1540 |
} |
273ec3b182bf
(svn r6624) -Feature: added ability to add refit commands to vehicle orders (can only be done in goto depot orders)
bjarni
parents:
4661
diff
changeset
|
1541 |
|
5108
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5024
diff
changeset
|
1542 |
if (CheckSavegameVersion(37)) { |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5024
diff
changeset
|
1543 |
ConvertNameArray(); |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5024
diff
changeset
|
1544 |
} |
dc67d70b5a45
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
peter1138
parents:
5024
diff
changeset
|
1545 |
|
5116
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1546 |
/* from version 38 we have optional elrails */ |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1547 |
if (CheckSavegameVersion(38)) { |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1548 |
/* old game - before elrails made optional */ |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1549 |
if (CheckSavegameVersion(24)) { |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1550 |
/* very old game - before elrail was introduced */ |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1551 |
_patches.disable_elrails = true; // disable elrails |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1552 |
} else { |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1553 |
/* game with mandatory elrails (r4150+) */ |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1554 |
_patches.disable_elrails = false; // enable elrails |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1555 |
} |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1556 |
} |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1557 |
/* do the same as when elrails were enabled/disabled manually just now */ |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1558 |
SettingsDisableElrail(_patches.disable_elrails); |
2a33a74925c5
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
1559 |
|
0 | 1560 |
return true; |
1561 |
} |