author | rubidium |
Thu, 18 Dec 2008 12:23:08 +0000 | |
changeset 10436 | 8d3a9fbe8f19 |
parent 10429 | b81d72d5b44a |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
9111
48ce04029fe4
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
rubidium
parents:
9095
diff
changeset
|
3 |
/** @file openttd.cpp Functions related to starting OpenTTD. */ |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
8788
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
6 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
7 |
#define VARDEF |
8788
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
8 |
#include "variables.h" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
9 |
#undef VARDEF |
0 | 10 |
|
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1885
diff
changeset
|
11 |
#include "openttd.h" |
8788
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
12 |
|
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
13 |
#include "driver.h" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
14 |
#include "blitter/factory.hpp" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
15 |
#include "sound/sound_driver.hpp" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
16 |
#include "music/music_driver.hpp" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
17 |
#include "video/video_driver.hpp" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
18 |
|
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
19 |
#include "fontcache.h" |
2340
e18ef06bc59a
(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
|
20 |
#include "gfxinit.h" |
8788
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
21 |
#include "gfx_func.h" |
0 | 22 |
#include "gui.h" |
8788
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
23 |
#include "mixer.h" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
24 |
#include "sound_func.h" |
8107
bb7deea89175
(svn r11668) -Codechange: more refactoring aimed at reducing compile time and making it more logic where function definitions can be found.
rubidium
parents:
8106
diff
changeset
|
25 |
#include "window_func.h" |
8788
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
26 |
|
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
27 |
#include "debug.h" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
28 |
#include "saveload.h" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
29 |
#include "landscape.h" |
10208
72c00af5c95d
(svn r14422) -Codechange: also reflect the changes of r14421 in the filenames.
rubidium
parents:
10207
diff
changeset
|
30 |
#include "company_func.h" |
72c00af5c95d
(svn r14422) -Codechange: also reflect the changes of r14421 in the filenames.
rubidium
parents:
10207
diff
changeset
|
31 |
#include "company_base.h" |
8116
8da76dcb3287
(svn r11677) -Codechange: move price and command related types/functions to their respective places.
rubidium
parents:
8114
diff
changeset
|
32 |
#include "command_func.h" |
0 | 33 |
#include "town.h" |
34 |
#include "industry.h" |
|
8763
81fadd257f67
(svn r12459) -Codechange: split news.h into news_type.h and news_func.h.
rubidium
parents:
8707
diff
changeset
|
35 |
#include "news_func.h" |
10039
1f236afd6cd1
(svn r14199) -Codechange: split fileio.h into fileio_type.h and fileio_func.h so not everything that includes saveload.h needs to include everything else too.
rubidium
parents:
10037
diff
changeset
|
36 |
#include "fileio_func.h" |
8151
4cefeef74c28
(svn r11713) -Codechange: Move some declarations and definitions in a more logical disposition
belugas
parents:
8144
diff
changeset
|
37 |
#include "fios.h" |
0 | 38 |
#include "airport.h" |
6193
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
39 |
#include "aircraft.h" |
9336 | 40 |
#include "console_func.h" |
430 | 41 |
#include "screenshot.h" |
5469
7edfc643abbc
(svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater.
rubidium
parents:
5436
diff
changeset
|
42 |
#include "network/network.h" |
9428
1ba05b499957
(svn r13343) -Codechange: reorder/move variable/functions in the network headers so that nothing from the network directory needs to include basically all network headers.
rubidium
parents:
9420
diff
changeset
|
43 |
#include "network/network_func.h" |
8790 | 44 |
#include "signs_base.h" |
45 |
#include "signs_func.h" |
|
1542
62a03537ad0b
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1501
diff
changeset
|
46 |
#include "waypoint.h" |
2395
d1629f64d157
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2383
diff
changeset
|
47 |
#include "ai/ai.h" |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2848
diff
changeset
|
48 |
#include "train.h" |
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3891
diff
changeset
|
49 |
#include "yapf/yapf.h" |
8208
3d0590aa2124
(svn r11771) -Codechange: split settings.h into better separated headers.
rubidium
parents:
8179
diff
changeset
|
50 |
#include "settings_func.h" |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
51 |
#include "genworld.h" |
10208
72c00af5c95d
(svn r14422) -Codechange: also reflect the changes of r14421 in the filenames.
rubidium
parents:
10207
diff
changeset
|
52 |
#include "company_manager_face.h" |
8788
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
53 |
#include "group.h" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
54 |
#include "strings_func.h" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
55 |
#include "date_func.h" |
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
56 |
#include "vehicle_func.h" |
9457
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
9429
diff
changeset
|
57 |
#include "gamelog.h" |
8965
29a591456a2f
(svn r12757) -Codechange: move all cheat related stuff from all over the place to a single location.
rubidium
parents:
8962
diff
changeset
|
58 |
#include "cheat_func.h" |
9005
d6b0e0a54ef2
(svn r12800) -Codechange: move the animated tile related functions out of texteff.cpp (it isn't a text effect after all). Also remove a few more functions from functions.
rubidium
parents:
8989
diff
changeset
|
59 |
#include "animated_tile_func.h" |
9006
7666e7b47088
(svn r12801) -Codechange: remove the dependency of function.h in town_map.h
rubidium
parents:
9005
diff
changeset
|
60 |
#include "functions.h" |
9154
2c042b567165
(svn r13016) -Codechange: unify the detection if rail catenary should be drawn
smatz
parents:
9111
diff
changeset
|
61 |
#include "elrail_func.h" |
9085
8b3897a75aed
(svn r12944) -Codechange: use rev.h instead of externs at many places
smatz
parents:
9070
diff
changeset
|
62 |
#include "rev.h" |
8788
42adcef829f4
(svn r12498) -Codechange: bring a little 'order' to openttd.cpp's includes and do not 'define' VARDEF for files that do not have them anymore.
rubidium
parents:
8787
diff
changeset
|
63 |
|
6451
e576c71bfc09
(svn r9601) -Codechange: Store grf file reference in station spec, not just GRF ID
peter1138
parents:
6427
diff
changeset
|
64 |
#include "newgrf.h" |
5228
26dc9acf7d94
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
65 |
#include "newgrf_config.h" |
6332
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
66 |
#include "newgrf_house.h" |
6629
eba0ac353e4d
(svn r9850) -Codechange: Introduction of the Override/Substitute manager. Currently only used for newhouses.
belugas
parents:
6626
diff
changeset
|
67 |
#include "newgrf_commons.h" |
8787
41d9d5adbe87
(svn r12495) -Codechange: reduce the dependency on newgrf_station.h (especially because newgrf_station.h includes a lot of stuff).
rubidium
parents:
8786
diff
changeset
|
68 |
#include "newgrf_station.h" |
0 | 69 |
|
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
70 |
#include "clear_map.h" |
8787
41d9d5adbe87
(svn r12495) -Codechange: reduce the dependency on newgrf_station.h (especially because newgrf_station.h includes a lot of stuff).
rubidium
parents:
8786
diff
changeset
|
71 |
#include "tree_map.h" |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
72 |
#include "rail_map.h" |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
73 |
#include "road_map.h" |
10289
801e5451f0ca
(svn r14528) -Codechange: cache the closest town for all road tiles instead of only roads owned by tiles. This replaces a O(n) search over all towns from the road's tileloop with a O(1) lookup (PhilSophus)
rubidium
parents:
10262
diff
changeset
|
74 |
#include "road_cmd.h" |
8787
41d9d5adbe87
(svn r12495) -Codechange: reduce the dependency on newgrf_station.h (especially because newgrf_station.h includes a lot of stuff).
rubidium
parents:
8786
diff
changeset
|
75 |
#include "station_map.h" |
41d9d5adbe87
(svn r12495) -Codechange: reduce the dependency on newgrf_station.h (especially because newgrf_station.h includes a lot of stuff).
rubidium
parents:
8786
diff
changeset
|
76 |
#include "town_map.h" |
5436
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
77 |
#include "industry_map.h" |
6257
5e5a864cacf6
(svn r9066) -Fix [FS#638]: store the owner of a statue, so when it gets removed, the town is notified of it
truelight
parents:
6247
diff
changeset
|
78 |
#include "unmovable_map.h" |
8787
41d9d5adbe87
(svn r12495) -Codechange: reduce the dependency on newgrf_station.h (especially because newgrf_station.h includes a lot of stuff).
rubidium
parents:
8786
diff
changeset
|
79 |
#include "tunnel_map.h" |
41d9d5adbe87
(svn r12495) -Codechange: reduce the dependency on newgrf_station.h (especially because newgrf_station.h includes a lot of stuff).
rubidium
parents:
8786
diff
changeset
|
80 |
#include "bridge_map.h" |
41d9d5adbe87
(svn r12495) -Codechange: reduce the dependency on newgrf_station.h (especially because newgrf_station.h includes a lot of stuff).
rubidium
parents:
8786
diff
changeset
|
81 |
#include "water_map.h" |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
8082
diff
changeset
|
82 |
#include "tunnelbridge_map.h" |
8108
b42a0e5c67ef
(svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h
rubidium
parents:
8107
diff
changeset
|
83 |
#include "void_map.h" |
8471
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
84 |
#include "water.h" |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
85 |
|
0 | 86 |
#include <stdarg.h> |
87 |
||
8264
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8258
diff
changeset
|
88 |
#include "table/strings.h" |
b1e85998c7d3
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8258
diff
changeset
|
89 |
|
8973
749e572f9378
(svn r12765) -Codechange: move some stuff out of variables.h that required including other headers in variables.h.
rubidium
parents:
8965
diff
changeset
|
90 |
StringID _switch_mode_errorstr; |
749e572f9378
(svn r12765) -Codechange: move some stuff out of variables.h that required including other headers in variables.h.
rubidium
parents:
8965
diff
changeset
|
91 |
|
6247 | 92 |
void CallLandscapeTick(); |
93 |
void IncreaseDate(); |
|
94 |
void DoPaletteAnimations(); |
|
95 |
void MusicLoop(); |
|
96 |
void ResetMusic(); |
|
8987
80d22b9c2a0c
(svn r12782) -Codechange: remove some functions from functions.h and do not statically 'waste' memory when the old name array is not needed anymore.
rubidium
parents:
8985
diff
changeset
|
97 |
void ResetOldNames(); |
8989
42f45270fbca
(svn r12784) -Codechange: handle the asynchronious save 'handlers' in saveload.cpp instead of openttd.cpp.
rubidium
parents:
8987
diff
changeset
|
98 |
void ProcessAsyncSaveFinish(); |
9161
fda175383e87
(svn r13024) -Codechange: do not use WE_MOUSELOOP when WE_TICK suffices, rename WE_4 to something more descriptive and correct some (completely incorrect) comments.
rubidium
parents:
9159
diff
changeset
|
99 |
void CallWindowTickEvent(); |
0 | 100 |
|
9358
2e1e4d2f71dd
(svn r13255) -Codechange: move _opt to _settings.
rubidium
parents:
9354
diff
changeset
|
101 |
extern void SetDifficultyLevel(int mode, DifficultySettings *gm_opt); |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
102 |
extern Company *DoStartupNewCompany(bool is_ai); |
9470
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
103 |
extern void ShowOSErrorBox(const char *buf, bool system); |
8809
e0d09d74e805
(svn r12550) -Change: the signal GUI is now persistent - has the same data when it is reopened
smatz
parents:
8790
diff
changeset
|
104 |
extern void InitializeRailGUI(); |
0 | 105 |
|
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
106 |
/** |
9470
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
107 |
* Error handling for fatal user errors. |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
108 |
* @param s the string to print. |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
109 |
* @note Does NEVER return. |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
110 |
*/ |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
111 |
void CDECL usererror(const char *s, ...) |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
112 |
{ |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
113 |
va_list va; |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
114 |
char buf[512]; |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
115 |
|
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
116 |
va_start(va, s); |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
117 |
vsnprintf(buf, lengthof(buf), s, va); |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
118 |
va_end(va); |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
119 |
|
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
120 |
ShowOSErrorBox(buf, false); |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
121 |
if (_video_driver != NULL) _video_driver->Stop(); |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
122 |
|
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
123 |
exit(1); |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
124 |
} |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
125 |
|
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
126 |
/** |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
127 |
* Error handling for fatal non-user errors. |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
128 |
* @param s the string to print. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
129 |
* @note Does NEVER return. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
130 |
*/ |
4171 | 131 |
void CDECL error(const char *s, ...) |
2639 | 132 |
{ |
0 | 133 |
va_list va; |
134 |
char buf[512]; |
|
2639 | 135 |
|
0 | 136 |
va_start(va, s); |
5170
817550aa5a5f
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
137 |
vsnprintf(buf, lengthof(buf), s, va); |
0 | 138 |
va_end(va); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
139 |
|
9470
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
140 |
ShowOSErrorBox(buf, true); |
7170
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
141 |
if (_video_driver != NULL) _video_driver->Stop(); |
0 | 142 |
|
143 |
assert(0); |
|
144 |
exit(1); |
|
145 |
} |
|
146 |
||
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
147 |
/** |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
148 |
* Shows some information on the console/a popup box depending on the OS. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
149 |
* @param str the text to show. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
150 |
*/ |
0 | 151 |
void CDECL ShowInfoF(const char *str, ...) |
152 |
{ |
|
153 |
va_list va; |
|
154 |
char buf[1024]; |
|
155 |
va_start(va, str); |
|
5170
817550aa5a5f
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
156 |
vsnprintf(buf, lengthof(buf), str, va); |
0 | 157 |
va_end(va); |
158 |
ShowInfo(buf); |
|
159 |
} |
|
160 |
||
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
161 |
/** |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
162 |
* Show the help message when someone passed a wrong parameter. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
163 |
*/ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
164 |
static void ShowHelp() |
0 | 165 |
{ |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
166 |
char buf[4096]; |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
167 |
char *p = buf; |
2831
952f77671794
(svn r3379) -Fix: protect showhelp against any possible overflow
truelight
parents:
2828
diff
changeset
|
168 |
|
10299
946c84fdc58e
(svn r14540) -Codechange: introduce [v]seprintf which are like [v]snprintf but do return the number of characters written instead of the number of characters that would be written; as size_t is unsigned substraction can cause integer underflows quite quickly.
rubidium
parents:
10296
diff
changeset
|
169 |
p += seprintf(p, lastof(buf), "OpenTTD %s\n", _openttd_revision); |
5170
817550aa5a5f
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
170 |
p = strecpy(p, |
2831
952f77671794
(svn r3379) -Fix: protect showhelp against any possible overflow
truelight
parents:
2828
diff
changeset
|
171 |
"\n" |
952f77671794
(svn r3379) -Fix: protect showhelp against any possible overflow
truelight
parents:
2828
diff
changeset
|
172 |
"\n" |
0 | 173 |
"Command line options:\n" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
174 |
" -v drv = Set video driver (see below)\n" |
5885
28503880e8f3
(svn r8497) -Codechange: Increase the size of the sound/video/music-drivers to 32 bytes (instead of 16) so their actual parameters can be passed. Sound has for example 'bufsize' and 'hz'. Also use the recently introduced StrEmpty().
Darkvater
parents:
5884
diff
changeset
|
175 |
" -s drv = Set sound driver (see below) (param bufsize,hz)\n" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
176 |
" -m drv = Set music driver (see below)\n" |
6852
439563b70fd3
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
6770
diff
changeset
|
177 |
" -b drv = Set the blitter to use (see below)\n" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
178 |
" -r res = Set resolution (for instance 800x600)\n" |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
179 |
" -h = Display this help text\n" |
4285
19cb745c694e
(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
|
180 |
" -t year = Set starting year\n" |
1440
08722492ee27
(svn r1944) Make --help output for -d at least somewhat useful.
pasky
parents:
1436
diff
changeset
|
181 |
" -d [[fac=]lvl[,...]]= Debug mode\n" |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
182 |
" -e = Start Editor\n" |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
183 |
" -g [savegame] = Start new/save game immediately\n" |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
184 |
" -G seed = Set random seed\n" |
5692
bce5374837b0
(svn r8155) -Fix: fixed compilation when --disable-network is in use
bjarni
parents:
5683
diff
changeset
|
185 |
#if defined(ENABLE_NETWORK) |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
186 |
" -n [ip:port#company]= Start networkgame\n" |
5508
4b30455aba12
(svn r7802) -Feature: make it possible to override the bind address and port of a dedicated server from the command line.
rubidium
parents:
5507
diff
changeset
|
187 |
" -D [ip][:port] = Start dedicated server\n" |
5959
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
188 |
" -l ip[:port] = Redirect DEBUG()\n" |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
189 |
#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32) |
704
e843dd369938
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
190 |
" -f = Fork into the background (dedicated only)\n" |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
191 |
#endif |
5692
bce5374837b0
(svn r8155) -Fix: fixed compilation when --disable-network is in use
bjarni
parents:
5683
diff
changeset
|
192 |
#endif /* ENABLE_NETWORK */ |
10296
8fb5cc7c257c
(svn r14535) -Fix: Description of '-i' commandline option.
frosch
parents:
10289
diff
changeset
|
193 |
" -i palette = Force to use the DOS (0) or Windows (1) palette\n" |
8fb5cc7c257c
(svn r14535) -Fix: Description of '-i' commandline option.
frosch
parents:
10289
diff
changeset
|
194 |
" (defines default setting when adding newgrfs)\n" |
10361
8afaf71b7a95
(svn r14612) -Change: force the argument given to '-i' parameter to be valid. Accept '2', too
smatz
parents:
10360
diff
changeset
|
195 |
" Default value (2) lets OpenTTD use the palette\n" |
8afaf71b7a95
(svn r14612) -Change: force the argument given to '-i' parameter to be valid. Accept '2', too
smatz
parents:
10360
diff
changeset
|
196 |
" specified in graphics set file (see below)\n" |
9994
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
197 |
" -I graphics_set = Force the graphics set (see below)\n" |
2831
952f77671794
(svn r3379) -Fix: protect showhelp against any possible overflow
truelight
parents:
2828
diff
changeset
|
198 |
" -c config_file = Use 'config_file' instead of 'openttd.cfg'\n" |
9994
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
199 |
" -x = Do not automatically save to config file on exit\n" |
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
200 |
"\n", |
5170
817550aa5a5f
(svn r7280) -Codechange: Replace some sprintf() functions with the safer snprintf() functions
Darkvater
parents:
5166
diff
changeset
|
201 |
lastof(buf) |
0 | 202 |
); |
203 |
||
9994
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
204 |
/* List the graphics packs */ |
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
205 |
p = GetGraphicsSetsList(p, lastof(buf)); |
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
206 |
|
7170
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
207 |
/* List the drivers */ |
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
208 |
p = VideoDriverFactoryBase::GetDriversInfo(p, lastof(buf)); |
0 | 209 |
|
6852
439563b70fd3
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
6770
diff
changeset
|
210 |
/* List the blitters */ |
439563b70fd3
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
6770
diff
changeset
|
211 |
p = BlitterFactoryBase::GetBlittersInfo(p, lastof(buf)); |
439563b70fd3
(svn r10092) -Codechange: code-seperated the spriteloader and blitter from the rest of the code
truelight
parents:
6770
diff
changeset
|
212 |
|
5723
748cb24d9340
(svn r8240) -Fix (r8013): Put the output of -h to stdout and not to stderr (through ShowInfo)
Darkvater
parents:
5707
diff
changeset
|
213 |
/* ShowInfo put output to stderr, but version information should go |
748cb24d9340
(svn r8240) -Fix (r8013): Put the output of -h to stdout and not to stderr (through ShowInfo)
Darkvater
parents:
5707
diff
changeset
|
214 |
* to stdout; this is the only exception */ |
748cb24d9340
(svn r8240) -Fix (r8013): Put the output of -h to stdout and not to stderr (through ShowInfo)
Darkvater
parents:
5707
diff
changeset
|
215 |
#if !defined(WIN32) && !defined(WIN64) |
748cb24d9340
(svn r8240) -Fix (r8013): Put the output of -h to stdout and not to stderr (through ShowInfo)
Darkvater
parents:
5707
diff
changeset
|
216 |
printf("%s\n", buf); |
748cb24d9340
(svn r8240) -Fix (r8013): Put the output of -h to stdout and not to stderr (through ShowInfo)
Darkvater
parents:
5707
diff
changeset
|
217 |
#else |
0 | 218 |
ShowInfo(buf); |
5723
748cb24d9340
(svn r8240) -Fix (r8013): Put the output of -h to stdout and not to stderr (through ShowInfo)
Darkvater
parents:
5707
diff
changeset
|
219 |
#endif |
0 | 220 |
} |
221 |
||
222 |
||
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
223 |
struct MyGetOptData { |
0 | 224 |
char *opt; |
225 |
int numleft; |
|
226 |
char **argv; |
|
227 |
const char *options; |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
228 |
const char *cont; |
0 | 229 |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
230 |
MyGetOptData(int argc, char **argv, const char *options) |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
231 |
{ |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
232 |
opt = NULL; |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
233 |
numleft = argc; |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
234 |
this->argv = argv; |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
235 |
this->options = options; |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
236 |
cont = NULL; |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
237 |
} |
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
238 |
}; |
0 | 239 |
|
240 |
static int MyGetOpt(MyGetOptData *md) |
|
241 |
{ |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
242 |
const char *s,*r,*t; |
0 | 243 |
|
2639 | 244 |
s = md->cont; |
245 |
if (s != NULL) |
|
0 | 246 |
goto md_continue_here; |
247 |
||
2639 | 248 |
for (;;) { |
249 |
if (--md->numleft < 0) return -1; |
|
0 | 250 |
|
251 |
s = *md->argv++; |
|
252 |
if (*s == '-') { |
|
253 |
md_continue_here:; |
|
254 |
s++; |
|
255 |
if (*s != 0) { |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
256 |
/* Found argument, try to locate it in options. */ |
0 | 257 |
if (*s == ':' || (r = strchr(md->options, *s)) == NULL) { |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
258 |
/* ERROR! */ |
0 | 259 |
return -2; |
260 |
} |
|
261 |
if (r[1] == ':') { |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
262 |
/* Item wants an argument. Check if the argument follows, or if it comes as a separate arg. */ |
0 | 263 |
if (!*(t = s + 1)) { |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
264 |
/* It comes as a separate arg. Check if out of args? */ |
0 | 265 |
if (--md->numleft < 0 || *(t = *md->argv) == '-') { |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
266 |
/* Check if item is optional? */ |
0 | 267 |
if (r[2] != ':') |
268 |
return -2; |
|
269 |
md->numleft++; |
|
270 |
t = NULL; |
|
271 |
} else { |
|
272 |
md->argv++; |
|
273 |
} |
|
274 |
} |
|
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
275 |
md->opt = (char*)t; |
0 | 276 |
md->cont = NULL; |
277 |
return *s; |
|
278 |
} |
|
279 |
md->opt = NULL; |
|
280 |
md->cont = s; |
|
281 |
return *s; |
|
282 |
} |
|
283 |
} else { |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
284 |
/* This is currently not supported. */ |
0 | 285 |
return -2; |
286 |
} |
|
287 |
} |
|
288 |
} |
|
289 |
||
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
290 |
/** |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
291 |
* Extract the resolution from the given string and store |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
292 |
* it in the 'res' parameter. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
293 |
* @param res variable to store the resolution in. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
294 |
* @param s the string to decompose. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
295 |
*/ |
9533
e8b86b70c5f6
(svn r13537) -Fix [FS#2090](r13523): QSortT won't work this way, use Dimension instead of uint16[2] for resolutions
smatz
parents:
9470
diff
changeset
|
296 |
static void ParseResolution(Dimension *res, const char *s) |
0 | 297 |
{ |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
298 |
const char *t = strchr(s, 'x'); |
0 | 299 |
if (t == NULL) { |
300 |
ShowInfoF("Invalid resolution '%s'", s); |
|
301 |
return; |
|
302 |
} |
|
303 |
||
9533
e8b86b70c5f6
(svn r13537) -Fix [FS#2090](r13523): QSortT won't work this way, use Dimension instead of uint16[2] for resolutions
smatz
parents:
9470
diff
changeset
|
304 |
res->width = max(strtoul(s, NULL, 0), 64UL); |
e8b86b70c5f6
(svn r13537) -Fix [FS#2090](r13523): QSortT won't work this way, use Dimension instead of uint16[2] for resolutions
smatz
parents:
9470
diff
changeset
|
305 |
res->height = max(strtoul(t + 1, NULL, 0), 64UL); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
306 |
} |
0 | 307 |
|
6247 | 308 |
static void InitializeDynamicVariables() |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
309 |
{ |
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
310 |
/* Dynamic stuff needs to be initialized somewhere... */ |
7152
89373fa66dc5
(svn r10426) -Codechange: Activate the reset of industry/tiles mapping upon initialization or new game.
belugas
parents:
7091
diff
changeset
|
311 |
_industry_mngr.ResetMapping(); |
89373fa66dc5
(svn r10426) -Codechange: Activate the reset of industry/tiles mapping upon initialization or new game.
belugas
parents:
7091
diff
changeset
|
312 |
_industile_mngr.ResetMapping(); |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
313 |
_Company_pool.AddBlockToPool(); |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
314 |
} |
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
315 |
|
5659
573700347887
(svn r8119) -Fix (r8101): Uninitializing windows should be called before freeing dynamic variables as windows could use those variables during cleanup (eg WE_DESTROY calling GetStation(w->window_number).
Darkvater
parents:
5652
diff
changeset
|
316 |
|
9159
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
317 |
/** Unitializes drivers, frees allocated memory, cleans pools, ... |
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
318 |
* Generally, prepares the game for shutting down |
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
319 |
*/ |
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
320 |
static void ShutdownGame() |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
321 |
{ |
9159
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
322 |
/* stop the AI */ |
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
323 |
AI_Uninitialize(); |
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
324 |
|
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
325 |
IConsoleFree(); |
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
326 |
|
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
327 |
if (_network_available) NetworkShutDown(); // Shut down the network and close any open connections |
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
328 |
|
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
329 |
DriverFactoryBase::ShutdownDrivers(); |
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
330 |
|
5659
573700347887
(svn r8119) -Fix (r8101): Uninitializing windows should be called before freeing dynamic variables as windows could use those variables during cleanup (eg WE_DESTROY calling GetStation(w->window_number).
Darkvater
parents:
5652
diff
changeset
|
331 |
UnInitWindowSystem(); |
573700347887
(svn r8119) -Fix (r8101): Uninitializing windows should be called before freeing dynamic variables as windows could use those variables during cleanup (eg WE_DESTROY calling GetStation(w->window_number).
Darkvater
parents:
5652
diff
changeset
|
332 |
|
573700347887
(svn r8119) -Fix (r8101): Uninitializing windows should be called before freeing dynamic variables as windows could use those variables during cleanup (eg WE_DESTROY calling GetStation(w->window_number).
Darkvater
parents:
5652
diff
changeset
|
333 |
/* Uninitialize airport state machines */ |
573700347887
(svn r8119) -Fix (r8101): Uninitializing windows should be called before freeing dynamic variables as windows could use those variables during cleanup (eg WE_DESTROY calling GetStation(w->window_number).
Darkvater
parents:
5652
diff
changeset
|
334 |
UnInitializeAirports(); |
573700347887
(svn r8119) -Fix (r8101): Uninitializing windows should be called before freeing dynamic variables as windows could use those variables during cleanup (eg WE_DESTROY calling GetStation(w->window_number).
Darkvater
parents:
5652
diff
changeset
|
335 |
|
573700347887
(svn r8119) -Fix (r8101): Uninitializing windows should be called before freeing dynamic variables as windows could use those variables during cleanup (eg WE_DESTROY calling GetStation(w->window_number).
Darkvater
parents:
5652
diff
changeset
|
336 |
/* Uninitialize variables that are allocated dynamically */ |
9457
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
9429
diff
changeset
|
337 |
GamelogReset(); |
7401
7a72cc2a1196
(svn r10773) -Codechange: use pool.CleanPool instead of CleanPool(&pool) and similarly for AddBlock*.
rubidium
parents:
7393
diff
changeset
|
338 |
_Town_pool.CleanPool(); |
7a72cc2a1196
(svn r10773) -Codechange: use pool.CleanPool instead of CleanPool(&pool) and similarly for AddBlock*.
rubidium
parents:
7393
diff
changeset
|
339 |
_Industry_pool.CleanPool(); |
7a72cc2a1196
(svn r10773) -Codechange: use pool.CleanPool instead of CleanPool(&pool) and similarly for AddBlock*.
rubidium
parents:
7393
diff
changeset
|
340 |
_Station_pool.CleanPool(); |
7a72cc2a1196
(svn r10773) -Codechange: use pool.CleanPool instead of CleanPool(&pool) and similarly for AddBlock*.
rubidium
parents:
7393
diff
changeset
|
341 |
_Vehicle_pool.CleanPool(); |
7a72cc2a1196
(svn r10773) -Codechange: use pool.CleanPool instead of CleanPool(&pool) and similarly for AddBlock*.
rubidium
parents:
7393
diff
changeset
|
342 |
_Sign_pool.CleanPool(); |
7a72cc2a1196
(svn r10773) -Codechange: use pool.CleanPool instead of CleanPool(&pool) and similarly for AddBlock*.
rubidium
parents:
7393
diff
changeset
|
343 |
_Order_pool.CleanPool(); |
7a72cc2a1196
(svn r10773) -Codechange: use pool.CleanPool instead of CleanPool(&pool) and similarly for AddBlock*.
rubidium
parents:
7393
diff
changeset
|
344 |
_Group_pool.CleanPool(); |
7a72cc2a1196
(svn r10773) -Codechange: use pool.CleanPool instead of CleanPool(&pool) and similarly for AddBlock*.
rubidium
parents:
7393
diff
changeset
|
345 |
_CargoPacket_pool.CleanPool(); |
9070
dd0121143eba
(svn r12924) -Feature: Introducing the so called 'engine pool' which primarily removes the fixed engine type limits and also happens to allow (with the patch option 'dynamic_engines') multiple NewGRF vehicle sets to coexist.
peter1138
parents:
9069
diff
changeset
|
346 |
_Engine_pool.CleanPool(); |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
347 |
_Company_pool.CleanPool(); |
1260
632f63689178
(svn r1764) -Add: dynamic towns, you can now have up to 64k towns (let me know when
truelight
parents:
1246
diff
changeset
|
348 |
|
1482
80e315adc3bd
(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
|
349 |
free(_config_file); |
9159
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
350 |
|
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
351 |
/* Close all and any open filehandles */ |
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
352 |
FioCloseAll(); |
1474
a26a21fa10ef
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
353 |
} |
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
354 |
|
6247 | 355 |
static void LoadIntroGame() |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
356 |
{ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
357 |
_game_mode = GM_MENU; |
6427
7dc1012757d8
(svn r9563) -Feature: Add more finer control to transparency options, including a new toolbar, accessible from the map menu or Ctrl X. Patch by Wolf01.
peter1138
parents:
6351
diff
changeset
|
358 |
|
5228
26dc9acf7d94
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
359 |
ResetGRFConfig(false); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
360 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
361 |
/* Setup main window */ |
1474
a26a21fa10ef
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
362 |
ResetWindowSystem(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
363 |
SetupColorsAndInitialWindow(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
364 |
|
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
365 |
/* Load the default opening screen savegame */ |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
366 |
if (SaveOrLoad("opntitle.dat", SL_LOAD, DATA_DIR) != SL_OK) { |
3033
9cba043eb38f
(svn r3613) Some more const, indentation, whitespace and similar stuff
tron
parents:
3024
diff
changeset
|
367 |
GenerateWorld(GW_EMPTY, 64, 64); // if failed loading, make empty world. |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
368 |
WaitTillGeneratedWorld(); |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
369 |
SetLocalCompany(COMPANY_SPECTATOR); |
10152
5faa68713d8c
(svn r14339) -Fix (r13731): crash when loading the intro game failed
smatz
parents:
10150
diff
changeset
|
370 |
} else { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
371 |
SetLocalCompany(COMPANY_FIRST); |
921 | 372 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
373 |
|
6231
ff7454d35935
(svn r9034) -Codechange: renamed _pause to _pause_game, as some targets already have
truelight
parents:
6229
diff
changeset
|
374 |
_pause_game = 0; |
4336
1e9ab68b9287
(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
|
375 |
_cursor.fix_at = false; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
376 |
MarkWholeScreenDirty(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
377 |
|
8085
5b58f6315fb8
(svn r11646) -Codechange: check whether (some) characters are missing in the current 'font' for the 'currently' chosen language and give a warning when that does happen.
rubidium
parents:
8083
diff
changeset
|
378 |
CheckForMissingGlyphsInLoadedLanguagePack(); |
5b58f6315fb8
(svn r11646) -Codechange: check whether (some) characters are missing in the current 'font' for the 'currently' chosen language and give a warning when that does happen.
rubidium
parents:
8083
diff
changeset
|
379 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
380 |
/* Play main theme */ |
7170
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
381 |
if (_music_driver->IsSongPlaying()) ResetMusic(); |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
382 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
383 |
|
8268
5027ad5e70a0
(svn r11832) -Codechange: get rid of (quite) some VARDEFs.
rubidium
parents:
8265
diff
changeset
|
384 |
byte _savegame_sort_order; |
2290 | 385 |
#if defined(UNIX) && !defined(__MORPHOS__) |
6247 | 386 |
extern void DedicatedFork(); |
2290 | 387 |
#endif |
704
e843dd369938
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
388 |
|
4171 | 389 |
int ttd_main(int argc, char *argv[]) |
0 | 390 |
{ |
391 |
int i; |
|
1010
977aafc6b8e3
(svn r1509) Const correctness and add static where appropriate while touching the lines anyway
tron
parents:
1009
diff
changeset
|
392 |
const char *optformat; |
9994
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
393 |
char musicdriver[32], sounddriver[32], videodriver[32], blitter[32], graphics_set[32]; |
9533
e8b86b70c5f6
(svn r13537) -Fix [FS#2090](r13523): QSortT won't work this way, use Dimension instead of uint16[2] for resolutions
smatz
parents:
9470
diff
changeset
|
394 |
Dimension resolution = {0, 0}; |
4293
4b7006c1b5eb
(svn r5926) -Codechange: make _cur_year contain the full year, instead of the offset since 1920
rubidium
parents:
4285
diff
changeset
|
395 |
Year startyear = INVALID_YEAR; |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
396 |
uint generation_seed = GENERATE_NEW_SEED; |
5692
bce5374837b0
(svn r8155) -Fix: fixed compilation when --disable-network is in use
bjarni
parents:
5683
diff
changeset
|
397 |
bool save_config = true; |
bce5374837b0
(svn r8155) -Fix: fixed compilation when --disable-network is in use
bjarni
parents:
5683
diff
changeset
|
398 |
#if defined(ENABLE_NETWORK) |
3058
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
399 |
bool dedicated = false; |
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
400 |
bool network = false; |
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
401 |
char *network_conn = NULL; |
5959
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
402 |
char *debuglog_conn = NULL; |
5508
4b30455aba12
(svn r7802) -Feature: make it possible to override the bind address and port of a dedicated server from the command line.
rubidium
parents:
5507
diff
changeset
|
403 |
char *dedicated_host = NULL; |
4b30455aba12
(svn r7802) -Feature: make it possible to override the bind address and port of a dedicated server from the command line.
rubidium
parents:
5507
diff
changeset
|
404 |
uint16 dedicated_port = 0; |
5692
bce5374837b0
(svn r8155) -Fix: fixed compilation when --disable-network is in use
bjarni
parents:
5683
diff
changeset
|
405 |
#endif /* ENABLE_NETWORK */ |
1406
f5da270a654f
(svn r1910) Move two variables out of variables.h which are only used locally
tron
parents:
1397
diff
changeset
|
406 |
|
9994
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
407 |
musicdriver[0] = sounddriver[0] = videodriver[0] = blitter[0] = graphics_set[0] = '\0'; |
0 | 408 |
|
409 |
_game_mode = GM_MENU; |
|
410 |
_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
|
411 |
_switch_mode_errorstr = INVALID_STRING_ID; |
704
e843dd369938
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
412 |
_dedicated_forks = false; |
1482
80e315adc3bd
(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
|
413 |
_config_file = NULL; |
0 | 414 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
415 |
/* The last param of the following function means this: |
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
416 |
* a letter means: it accepts that param (e.g.: -h) |
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
417 |
* a ':' behind it means: it need a param (e.g.: -m<driver>) |
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
418 |
* a '::' behind it means: it can optional have a param (e.g.: -d<debug>) */ |
9994
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
419 |
optformat = "m:s:v:b:hD::n::ei::I:t:d::r:g::G:c:xl:" |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
420 |
#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32) |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
421 |
"f" |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
422 |
#endif |
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
423 |
; |
770
c2eacca29601
(svn r1236) MorphOS: added make release like in OSX (tokai)
bjarni
parents:
768
diff
changeset
|
424 |
|
6491
00dc414c909d
(svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents:
6486
diff
changeset
|
425 |
MyGetOptData mgo(argc - 1, argv + 1, optformat); |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
426 |
|
0 | 427 |
while ((i = MyGetOpt(&mgo)) != -1) { |
2951 | 428 |
switch (i) { |
10310
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
429 |
case 'I': strecpy(graphics_set, mgo.opt, lastof(graphics_set)); break; |
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
430 |
case 'm': strecpy(musicdriver, mgo.opt, lastof(musicdriver)); break; |
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
431 |
case 's': strecpy(sounddriver, mgo.opt, lastof(sounddriver)); break; |
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
432 |
case 'v': strecpy(videodriver, mgo.opt, lastof(videodriver)); break; |
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
433 |
case 'b': strecpy(blitter, mgo.opt, lastof(blitter)); break; |
5692
bce5374837b0
(svn r8155) -Fix: fixed compilation when --disable-network is in use
bjarni
parents:
5683
diff
changeset
|
434 |
#if defined(ENABLE_NETWORK) |
3058
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
435 |
case 'D': |
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
436 |
strcpy(musicdriver, "null"); |
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
437 |
strcpy(sounddriver, "null"); |
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
438 |
strcpy(videodriver, "dedicated"); |
6878
5cefd3ac59c7
(svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents:
6867
diff
changeset
|
439 |
strcpy(blitter, "null"); |
3058
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
440 |
dedicated = true; |
5885
28503880e8f3
(svn r8497) -Codechange: Increase the size of the sound/video/music-drivers to 32 bytes (instead of 16) so their actual parameters can be passed. Sound has for example 'bufsize' and 'hz'. Also use the recently introduced StrEmpty().
Darkvater
parents:
5884
diff
changeset
|
441 |
if (mgo.opt != NULL) { |
5508
4b30455aba12
(svn r7802) -Feature: make it possible to override the bind address and port of a dedicated server from the command line.
rubidium
parents:
5507
diff
changeset
|
442 |
/* Use the existing method for parsing (openttd -n). |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
443 |
* However, we do ignore the #company part. */ |
5508
4b30455aba12
(svn r7802) -Feature: make it possible to override the bind address and port of a dedicated server from the command line.
rubidium
parents:
5507
diff
changeset
|
444 |
const char *temp = NULL; |
4b30455aba12
(svn r7802) -Feature: make it possible to override the bind address and port of a dedicated server from the command line.
rubidium
parents:
5507
diff
changeset
|
445 |
const char *port = NULL; |
4b30455aba12
(svn r7802) -Feature: make it possible to override the bind address and port of a dedicated server from the command line.
rubidium
parents:
5507
diff
changeset
|
446 |
ParseConnectionString(&temp, &port, mgo.opt); |
5885
28503880e8f3
(svn r8497) -Codechange: Increase the size of the sound/video/music-drivers to 32 bytes (instead of 16) so their actual parameters can be passed. Sound has for example 'bufsize' and 'hz'. Also use the recently introduced StrEmpty().
Darkvater
parents:
5884
diff
changeset
|
447 |
if (!StrEmpty(mgo.opt)) dedicated_host = mgo.opt; |
5508
4b30455aba12
(svn r7802) -Feature: make it possible to override the bind address and port of a dedicated server from the command line.
rubidium
parents:
5507
diff
changeset
|
448 |
if (port != NULL) dedicated_port = atoi(port); |
4b30455aba12
(svn r7802) -Feature: make it possible to override the bind address and port of a dedicated server from the command line.
rubidium
parents:
5507
diff
changeset
|
449 |
} |
3058
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
450 |
break; |
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
451 |
case 'f': _dedicated_forks = true; break; |
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
452 |
case 'n': |
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
453 |
network = true; |
3059
1726615b3ddd
(svn r3648) - Fix typo in r3647, don't ask me how it got there s/_/./
Darkvater
parents:
3058
diff
changeset
|
454 |
network_conn = mgo.opt; // optional IP parameter, NULL if unset |
3058
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
455 |
break; |
5959
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
456 |
case 'l': |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
457 |
debuglog_conn = mgo.opt; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
458 |
break; |
5692
bce5374837b0
(svn r8155) -Fix: fixed compilation when --disable-network is in use
bjarni
parents:
5683
diff
changeset
|
459 |
#endif /* ENABLE_NETWORK */ |
9533
e8b86b70c5f6
(svn r13537) -Fix [FS#2090](r13523): QSortT won't work this way, use Dimension instead of uint16[2] for resolutions
smatz
parents:
9470
diff
changeset
|
460 |
case 'r': ParseResolution(&resolution, mgo.opt); break; |
4285
19cb745c694e
(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
|
461 |
case 't': startyear = atoi(mgo.opt); break; |
0 | 462 |
case 'd': { |
463 |
#if defined(WIN32) |
|
464 |
CreateConsole(); |
|
465 |
#endif |
|
2639 | 466 |
if (mgo.opt != NULL) SetDebugString(mgo.opt); |
0 | 467 |
} break; |
468 |
case 'e': _switch_mode = SM_EDITOR; break; |
|
10361
8afaf71b7a95
(svn r14612) -Change: force the argument given to '-i' parameter to be valid. Accept '2', too
smatz
parents:
10360
diff
changeset
|
469 |
case 'i': |
8afaf71b7a95
(svn r14612) -Change: force the argument given to '-i' parameter to be valid. Accept '2', too
smatz
parents:
10360
diff
changeset
|
470 |
/* there is an argument, it is not empty, and it is exactly 1 char long */ |
8afaf71b7a95
(svn r14612) -Change: force the argument given to '-i' parameter to be valid. Accept '2', too
smatz
parents:
10360
diff
changeset
|
471 |
if (!StrEmpty(mgo.opt) && mgo.opt[1] == '\0') { |
8afaf71b7a95
(svn r14612) -Change: force the argument given to '-i' parameter to be valid. Accept '2', too
smatz
parents:
10360
diff
changeset
|
472 |
_use_palette = (PaletteType)(mgo.opt[0] - '0'); |
8afaf71b7a95
(svn r14612) -Change: force the argument given to '-i' parameter to be valid. Accept '2', too
smatz
parents:
10360
diff
changeset
|
473 |
if (_use_palette <= MAX_PAL) break; |
8afaf71b7a95
(svn r14612) -Change: force the argument given to '-i' parameter to be valid. Accept '2', too
smatz
parents:
10360
diff
changeset
|
474 |
} |
8afaf71b7a95
(svn r14612) -Change: force the argument given to '-i' parameter to be valid. Accept '2', too
smatz
parents:
10360
diff
changeset
|
475 |
usererror("Valid value for '-i' is 0, 1 or 2"); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
476 |
case 'g': |
2639 | 477 |
if (mgo.opt != NULL) { |
10310
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
478 |
strecpy(_file_to_saveload.name, mgo.opt, lastof(_file_to_saveload.name)); |
0 | 479 |
_switch_mode = SM_LOAD; |
9730
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
480 |
_file_to_saveload.mode = SL_LOAD; |
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
481 |
|
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
482 |
/* if the file doesn't exist or it is not a valid savegame, let the saveload code show an error */ |
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
483 |
const char *t = strrchr(_file_to_saveload.name, '.'); |
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
484 |
if (t != NULL) { |
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
485 |
FiosType ft = FiosGetSavegameListCallback(SLD_LOAD_GAME, _file_to_saveload.name, t, NULL); |
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
486 |
if (ft != FIOS_TYPE_INVALID) SetFiosType(ft); |
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
487 |
} |
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
488 |
|
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
489 |
break; |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
490 |
} |
9730
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
491 |
|
ae89a033cf1f
(svn r13859) -Fix: loading of TTD(Patch) savegames from the command line didn't work
smatz
parents:
9729
diff
changeset
|
492 |
_switch_mode = SM_NEWGAME; |
10195
bc84fd2b1476
(svn r14408) -Fix (r9205): generation seed set using -G was always overwritten by -g
glx
parents:
10167
diff
changeset
|
493 |
/* Give a random map if no seed has been given */ |
bc84fd2b1476
(svn r14408) -Fix (r9205): generation seed set using -G was always overwritten by -g
glx
parents:
10167
diff
changeset
|
494 |
if (generation_seed == GENERATE_NEW_SEED) { |
bc84fd2b1476
(svn r14408) -Fix (r9205): generation seed set using -G was always overwritten by -g
glx
parents:
10167
diff
changeset
|
495 |
generation_seed = InteractiveRandom(); |
bc84fd2b1476
(svn r14408) -Fix (r9205): generation seed set using -G was always overwritten by -g
glx
parents:
10167
diff
changeset
|
496 |
} |
0 | 497 |
break; |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
498 |
case 'G': generation_seed = atoi(mgo.opt); break; |
3058
8363e01ea189
(svn r3647) Some style-changes to the parameter parser
Darkvater
parents:
3033
diff
changeset
|
499 |
case 'c': _config_file = strdup(mgo.opt); break; |
5507
02ba56cb4272
(svn r7801) -Feature: add command line option to prevent saving of highscore and configuration on exit and a console command to manually initiate a configuration save (Aloysha).
rubidium
parents:
5475
diff
changeset
|
500 |
case 'x': save_config = false; break; |
0 | 501 |
case -2: |
2026 | 502 |
case 'h': |
9994
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
503 |
/* The next two functions are needed to list the graphics sets. |
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
504 |
* We can't do them earlier because then we can't show it on |
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
505 |
* the debug console as that hasn't been configured yet. */ |
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
506 |
DeterminePaths(argv[0]); |
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
507 |
FindGraphicsSets(); |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
508 |
ShowHelp(); |
0 | 509 |
return 0; |
510 |
} |
|
511 |
} |
|
512 |
||
7408
605b333582d5
(svn r10781) -Fix: ported more pieces to WinCE, so it compiles a bit more
truelight
parents:
7401
diff
changeset
|
513 |
#if defined(WINCE) && defined(_DEBUG) |
605b333582d5
(svn r10781) -Fix: ported more pieces to WinCE, so it compiles a bit more
truelight
parents:
7401
diff
changeset
|
514 |
/* Switch on debug lvl 4 for WinCE if Debug release, as you can't give params, and you most likely do want this information */ |
605b333582d5
(svn r10781) -Fix: ported more pieces to WinCE, so it compiles a bit more
truelight
parents:
7401
diff
changeset
|
515 |
SetDebugString("4"); |
605b333582d5
(svn r10781) -Fix: ported more pieces to WinCE, so it compiles a bit more
truelight
parents:
7401
diff
changeset
|
516 |
#endif |
605b333582d5
(svn r10781) -Fix: ported more pieces to WinCE, so it compiles a bit more
truelight
parents:
7401
diff
changeset
|
517 |
|
6317
70f4e9e52eb1
(svn r9266) -Codechange: unify the retrieval of the base paths a little more.
rubidium
parents:
6309
diff
changeset
|
518 |
DeterminePaths(argv[0]); |
9994
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
519 |
FindGraphicsSets(); |
704
e843dd369938
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
520 |
|
2290 | 521 |
#if defined(UNIX) && !defined(__MORPHOS__) |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
522 |
/* We must fork here, or we'll end up without some resources we need (like sockets) */ |
704
e843dd369938
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
523 |
if (_dedicated_forks) |
e843dd369938
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
524 |
DedicatedFork(); |
e843dd369938
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
525 |
#endif |
e843dd369938
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
526 |
|
0 | 527 |
LoadFromConfig(); |
1688
af2bb9bcb2ed
(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
|
528 |
CheckConfig(); |
983
4765bf636f6b
(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
|
529 |
LoadFromHighScore(); |
0 | 530 |
|
10037
a06670f961a8
(svn r14197) -Codechange: rework (original) base graphics determination methods. This yields in the following:
rubidium
parents:
9994
diff
changeset
|
531 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
532 |
/* override config? */ |
10310
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
533 |
if (!StrEmpty(graphics_set)) strecpy(_ini_graphics_set, graphics_set, lastof(_ini_graphics_set)); |
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
534 |
if (!StrEmpty(musicdriver)) strecpy(_ini_musicdriver, musicdriver, lastof(_ini_musicdriver)); |
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
535 |
if (!StrEmpty(sounddriver)) strecpy(_ini_sounddriver, sounddriver, lastof(_ini_sounddriver)); |
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
536 |
if (!StrEmpty(videodriver)) strecpy(_ini_videodriver, videodriver, lastof(_ini_videodriver)); |
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
537 |
if (!StrEmpty(blitter)) strecpy(_ini_blitter, blitter, lastof(_ini_blitter)); |
9533
e8b86b70c5f6
(svn r13537) -Fix [FS#2090](r13523): QSortT won't work this way, use Dimension instead of uint16[2] for resolutions
smatz
parents:
9470
diff
changeset
|
538 |
if (resolution.width != 0) { _cur_resolution = resolution; } |
9354
845e07db4549
(svn r13251) -Codechange: rename _patches to _settings as that is more logic.
rubidium
parents:
9346
diff
changeset
|
539 |
if (startyear != INVALID_YEAR) _settings_newgame.game_creation.starting_year = startyear; |
845e07db4549
(svn r13251) -Codechange: rename _patches to _settings as that is more logic.
rubidium
parents:
9346
diff
changeset
|
540 |
if (generation_seed != GENERATE_NEW_SEED) _settings_newgame.game_creation.generation_seed = generation_seed; |
0 | 541 |
|
6892
c23b5f195668
(svn r10139) -Fix: all inner parts of OpenTTD assume that the resolution is at least 1 by 1, so force the resolution to be always at least 1 by 1.
rubidium
parents:
6878
diff
changeset
|
542 |
/* The width and height must be at least 1 pixel, this |
c23b5f195668
(svn r10139) -Fix: all inner parts of OpenTTD assume that the resolution is at least 1 by 1, so force the resolution to be always at least 1 by 1.
rubidium
parents:
6878
diff
changeset
|
543 |
* way all internal drawing routines work correctly. */ |
9533
e8b86b70c5f6
(svn r13537) -Fix [FS#2090](r13523): QSortT won't work this way, use Dimension instead of uint16[2] for resolutions
smatz
parents:
9470
diff
changeset
|
544 |
if (_cur_resolution.width <= 0) _cur_resolution.width = 1; |
e8b86b70c5f6
(svn r13537) -Fix [FS#2090](r13523): QSortT won't work this way, use Dimension instead of uint16[2] for resolutions
smatz
parents:
9470
diff
changeset
|
545 |
if (_cur_resolution.height <= 0) _cur_resolution.height = 1; |
6892
c23b5f195668
(svn r10139) -Fix: all inner parts of OpenTTD assume that the resolution is at least 1 by 1, so force the resolution to be always at least 1 by 1.
rubidium
parents:
6878
diff
changeset
|
546 |
|
5692
bce5374837b0
(svn r8155) -Fix: fixed compilation when --disable-network is in use
bjarni
parents:
5683
diff
changeset
|
547 |
#if defined(ENABLE_NETWORK) |
9420
8a38703928e8
(svn r13334) -Codechange: move the network settings variables from network/network_internal to settings.
rubidium
parents:
9413
diff
changeset
|
548 |
if (dedicated_host) snprintf(_settings_client.network.server_bind_ip, sizeof(_settings_client.network.server_bind_ip), "%s", dedicated_host); |
8a38703928e8
(svn r13334) -Codechange: move the network settings variables from network/network_internal to settings.
rubidium
parents:
9413
diff
changeset
|
549 |
if (dedicated_port) _settings_client.network.server_port = dedicated_port; |
2951 | 550 |
if (_dedicated_forks && !dedicated) _dedicated_forks = false; |
5692
bce5374837b0
(svn r8155) -Fix: fixed compilation when --disable-network is in use
bjarni
parents:
5683
diff
changeset
|
551 |
#endif /* ENABLE_NETWORK */ |
704
e843dd369938
(svn r1154) -Add: [Network] Forked dedicated server (start openttd with -Df) (GeniusDex)
truelight
parents:
679
diff
changeset
|
552 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
553 |
/* enumerate language files */ |
0 | 554 |
InitializeLanguagePacks(); |
555 |
||
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
556 |
/* initialize screenshot formats */ |
0 | 557 |
InitializeScreenshotFormats(); |
558 |
||
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
559 |
/* initialize airport state machines */ |
105 | 560 |
InitializeAirports(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
561 |
|
919
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
562 |
/* initialize all variables that are allocated dynamically */ |
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
563 |
InitializeDynamicVariables(); |
544f374ee392
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
truelight
parents:
865
diff
changeset
|
564 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
565 |
/* Sample catalogue */ |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5376
diff
changeset
|
566 |
DEBUG(misc, 1, "Loading sound effects..."); |
1496
15d859a626e8
(svn r2000) Split the sound system into backend (mixer.[ch]) and frontend (sound.[ch])
tron
parents:
1482
diff
changeset
|
567 |
MxInitialize(11025); |
15d859a626e8
(svn r2000) Split the sound system into backend (mixer.[ch]) and frontend (sound.[ch])
tron
parents:
1482
diff
changeset
|
568 |
SoundInitialize("sample.cat"); |
0 | 569 |
|
5108
aeaef6fe53b7
(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
|
570 |
/* Initialize FreeType */ |
aeaef6fe53b7
(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
|
571 |
InitFreeType(); |
aeaef6fe53b7
(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
|
572 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
573 |
/* This must be done early, since functions use the InvalidateWindow* calls */ |
139 | 574 |
InitWindowSystem(); |
0 | 575 |
|
10037
a06670f961a8
(svn r14197) -Codechange: rework (original) base graphics determination methods. This yields in the following:
rubidium
parents:
9994
diff
changeset
|
576 |
if (!SetGraphicsSet(_ini_graphics_set)) { |
a06670f961a8
(svn r14197) -Codechange: rework (original) base graphics determination methods. This yields in the following:
rubidium
parents:
9994
diff
changeset
|
577 |
StrEmpty(_ini_graphics_set) ? |
9994
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
578 |
usererror("Failed to find a graphics set. Please acquire a graphics set for OpenTTD.") : |
10037
a06670f961a8
(svn r14197) -Codechange: rework (original) base graphics determination methods. This yields in the following:
rubidium
parents:
9994
diff
changeset
|
579 |
usererror("Failed to select requested graphics set '%s'", _ini_graphics_set); |
9994
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
580 |
} |
f9d5859f6aee
(svn r14151) -Codechange: make it possible to choose between the DOS and Windows graphics packs while retaining the possibility to override the palette.
rubidium
parents:
9989
diff
changeset
|
581 |
|
5166
f653f2e5384d
(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
|
582 |
/* Initialize game palette */ |
f653f2e5384d
(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
|
583 |
GfxInitPalettes(); |
f653f2e5384d
(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
|
584 |
|
7567
ab5661f127f8
(svn r11092) -Add: allow 'blitter=<value>' in openttd.cfg to set the blitter (so you don't have to keep on doing 'openttd -b 32bpp-optimized'..)
truelight
parents:
7515
diff
changeset
|
585 |
DEBUG(misc, 1, "Loading blitter..."); |
ab5661f127f8
(svn r11092) -Add: allow 'blitter=<value>' in openttd.cfg to set the blitter (so you don't have to keep on doing 'openttd -b 32bpp-optimized'..)
truelight
parents:
7515
diff
changeset
|
586 |
if (BlitterFactoryBase::SelectBlitter(_ini_blitter) == NULL) |
ab5661f127f8
(svn r11092) -Add: allow 'blitter=<value>' in openttd.cfg to set the blitter (so you don't have to keep on doing 'openttd -b 32bpp-optimized'..)
truelight
parents:
7515
diff
changeset
|
587 |
StrEmpty(_ini_blitter) ? |
9470
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
588 |
usererror("Failed to autoprobe blitter") : |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
589 |
usererror("Failed to select requested blitter '%s'; does it exist?", _ini_blitter); |
7170
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
590 |
|
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5376
diff
changeset
|
591 |
DEBUG(driver, 1, "Loading drivers..."); |
7170
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
592 |
|
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
593 |
_sound_driver = (SoundDriver*)SoundDriverFactoryBase::SelectDriver(_ini_sounddriver, Driver::DT_SOUND); |
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
594 |
if (_sound_driver == NULL) { |
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
595 |
StrEmpty(_ini_sounddriver) ? |
9470
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
596 |
usererror("Failed to autoprobe sound driver") : |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
597 |
usererror("Failed to select requested sound driver '%s'", _ini_sounddriver); |
7170
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
598 |
} |
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
599 |
|
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
600 |
_music_driver = (MusicDriver*)MusicDriverFactoryBase::SelectDriver(_ini_musicdriver, Driver::DT_MUSIC); |
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
601 |
if (_music_driver == NULL) { |
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
602 |
StrEmpty(_ini_musicdriver) ? |
9470
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
603 |
usererror("Failed to autoprobe music driver") : |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
604 |
usererror("Failed to select requested music driver '%s'", _ini_musicdriver); |
7170
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
605 |
} |
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
606 |
|
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
607 |
_video_driver = (VideoDriver*)VideoDriverFactoryBase::SelectDriver(_ini_videodriver, Driver::DT_VIDEO); |
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
608 |
if (_video_driver == NULL) { |
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
609 |
StrEmpty(_ini_videodriver) ? |
9470
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
610 |
usererror("Failed to autoprobe video driver") : |
08424e2e79e4
(svn r13390) -Codechange: introduce usererror() for fatal but not openttd related errors. Now all error() will 'crash' openttd after showing the message in win32 releases (MSVC), creating a crash.log and crash.dmp (like the '!' hack used before). On the other hand, usererror() will just close the game. So use error() only when it can be helpful to debugging, else use usererror().
glx
parents:
9466
diff
changeset
|
611 |
usererror("Failed to select requested video driver '%s'", _ini_videodriver); |
7170
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
612 |
} |
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
613 |
|
2526
29eef390cabb
(svn r3055) Give the savegame/scenarion sort order flags symbolic names
tron
parents:
2498
diff
changeset
|
614 |
_savegame_sort_order = SORT_BY_DATE | SORT_DESCENDING; |
6654
31d17823506f
(svn r9885) -Fix r9846: some last bitshifts with zoom-levels that were forgotten
truelight
parents:
6643
diff
changeset
|
615 |
/* Initialize the zoom level of the screen to normal */ |
31d17823506f
(svn r9885) -Fix r9846: some last bitshifts with zoom-levels that were forgotten
truelight
parents:
6643
diff
changeset
|
616 |
_screen.zoom = ZOOM_LVL_NORMAL; |
0 | 617 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
618 |
/* restore saved music volume */ |
7170
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
619 |
_music_driver->SetVolume(msf.music_vol); |
3678
696a32fc8a5d
(svn r4595) - Fix (FS#63) Music volume is now restored to the value saved in openttd.cfg
glx
parents:
3676
diff
changeset
|
620 |
|
4830
668bcb0a30b2
(svn r6754) -Codechange: Remove some #idef ENABLE_NETWORK specific defines. With networking
Darkvater
parents:
4829
diff
changeset
|
621 |
NetworkStartUp(); // initialize network-core |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
622 |
|
5959
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
623 |
#if defined(ENABLE_NETWORK) |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
624 |
if (debuglog_conn != NULL && _network_available) { |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
625 |
const char *not_used = NULL; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
626 |
const char *port = NULL; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
627 |
uint16 rport; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
628 |
|
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
629 |
rport = NETWORK_DEFAULT_DEBUGLOG_PORT; |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
630 |
|
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
631 |
ParseConnectionString(¬_used, &port, debuglog_conn); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
632 |
if (port != NULL) rport = atoi(port); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
633 |
|
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
634 |
NetworkStartDebugLog(debuglog_conn, rport); |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
635 |
} |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
636 |
#endif /* ENABLE_NETWORK */ |
98a64c6e7f1f
(svn r8631) -Add: added parameter -l ip[:port] to ./openttd, which redirects DEBUG() to a remote connection over TCP
truelight
parents:
5890
diff
changeset
|
637 |
|
5228
26dc9acf7d94
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
638 |
ScanNewGRFFiles(); |
26dc9acf7d94
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
639 |
|
26dc9acf7d94
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
640 |
ResetGRFConfig(false); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
641 |
|
1500
a66721629bc0
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
642 |
/* XXX - ugly hack, if diff_level is 9, it means we got no setting from the config file */ |
9358
2e1e4d2f71dd
(svn r13255) -Codechange: move _opt to _settings.
rubidium
parents:
9354
diff
changeset
|
643 |
if (_settings_newgame.difficulty.diff_level == 9) SetDifficultyLevel(0, &_settings_newgame.difficulty); |
0 | 644 |
|
9373
05d1da601ff7
(svn r13277) -Fix: opntitle 'jumping' to the temperate climate when closing the NewGRF settings window.
rubidium
parents:
9358
diff
changeset
|
645 |
/* Make sure _settings is filled with _settings_newgame if we switch to a game directly */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
646 |
if (_switch_mode != SM_NONE) _settings_game = _settings_newgame; |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
647 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
648 |
/* initialize the ingame console */ |
139 | 649 |
IConsoleInit(); |
3312
d28f88dc5587
(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
|
650 |
_cursor.in_window = true; |
1246
eb66ff34348f
(svn r1750) - Feature: [ 1093261 ] Saving vehicle sorting criteria for each vehicle type (bociusz)
darkvater
parents:
1243
diff
changeset
|
651 |
InitializeGUI(); |
644
cd687cdec701
(svn r1077) Implements scripts/autoexec.scr to get executed on game starting (sign_de)
dominik
parents:
630
diff
changeset
|
652 |
IConsoleCmdExec("exec scripts/autoexec.scr 0"); |
656
e3e435079efa
(svn r1090) -Fix: Made the _openttd_revision variable global, and with that
truelight
parents:
644
diff
changeset
|
653 |
|
2828
342f02f7c0d4
(svn r3376) -Codechange: made enums for GenerateWorld and InitializeGame 'mode'
truelight
parents:
2818
diff
changeset
|
654 |
GenerateWorld(GW_EMPTY, 64, 64); // Make the viewport initialization happy |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
655 |
WaitTillGeneratedWorld(); |
1268
bcbbc18f5c3e
(svn r1772) -Fix: [ 1114100 ] Dedicated server boots again
truelight
parents:
1267
diff
changeset
|
656 |
|
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
657 |
#ifdef ENABLE_NETWORK |
2951 | 658 |
if (network && _network_available) { |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
659 |
if (network_conn != NULL) { |
1329 | 660 |
const char *port = NULL; |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
661 |
const char *company = NULL; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
662 |
uint16 rport; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
663 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
664 |
rport = NETWORK_DEFAULT_PORT; |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
665 |
_network_playas = COMPANY_NEW_COMPANY; |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
666 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
667 |
ParseConnectionString(&company, &port, network_conn); |
4878
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4861
diff
changeset
|
668 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
669 |
if (company != NULL) { |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
670 |
_network_playas = (CompanyID)atoi(company); |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
671 |
|
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
672 |
if (_network_playas != COMPANY_SPECTATOR) { |
4880
aac84a9dcd03
(svn r6816) -Codechange: Some coding style, variable localization, const correctness.
Darkvater
parents:
4878
diff
changeset
|
673 |
_network_playas--; |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
674 |
if (_network_playas >= MAX_COMPANIES) return false; |
4878
4d4f76a898fd
(svn r6814) -Codechange: For network games ci->client_playas was always p->index + 1. To
Darkvater
parents:
4861
diff
changeset
|
675 |
} |
4861
2119f5d46e41
(svn r6787) -Codechange: Use PLAYER_NEW_COMPANY as a player identifier wishing to become a
Darkvater
parents:
4854
diff
changeset
|
676 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
677 |
if (port != NULL) rport = atoi(port); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
678 |
|
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
679 |
LoadIntroGame(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
680 |
_switch_mode = SM_NONE; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
681 |
NetworkClientConnectGame(network_conn, rport); |
1109
ecb98f43ba2c
(svn r1610) Remove trailing whitespace (last time ever, i hope)
tron
parents:
1105
diff
changeset
|
682 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
683 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
684 |
#endif /* ENABLE_NETWORK */ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
685 |
|
7170
923946ec324f
(svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents:
7152
diff
changeset
|
686 |
_video_driver->MainLoop(); |
139 | 687 |
|
2285
410dedcf46d1
(svn r2809) Implement more generic threading functions, which allow more than one thread
tron
parents:
2234
diff
changeset
|
688 |
WaitTillSaved(); |
0 | 689 |
|
5507
02ba56cb4272
(svn r7801) -Feature: add command line option to prevent saving of highscore and configuration on exit and a console command to manually initiate a configuration save (Aloysha).
rubidium
parents:
5475
diff
changeset
|
690 |
/* only save config if we have to */ |
02ba56cb4272
(svn r7801) -Feature: add command line option to prevent saving of highscore and configuration on exit and a console command to manually initiate a configuration save (Aloysha).
rubidium
parents:
5475
diff
changeset
|
691 |
if (save_config) { |
02ba56cb4272
(svn r7801) -Feature: add command line option to prevent saving of highscore and configuration on exit and a console command to manually initiate a configuration save (Aloysha).
rubidium
parents:
5475
diff
changeset
|
692 |
SaveToConfig(); |
02ba56cb4272
(svn r7801) -Feature: add command line option to prevent saving of highscore and configuration on exit and a console command to manually initiate a configuration save (Aloysha).
rubidium
parents:
5475
diff
changeset
|
693 |
SaveToHighScore(); |
02ba56cb4272
(svn r7801) -Feature: add command line option to prevent saving of highscore and configuration on exit and a console command to manually initiate a configuration save (Aloysha).
rubidium
parents:
5475
diff
changeset
|
694 |
} |
0 | 695 |
|
9159
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
696 |
/* Reset windowing system, stop drivers, free used memory, ... */ |
e8857a691840
(svn r13022) -Fix: driver list wasn't freed, replace by statically allocated one
smatz
parents:
9154
diff
changeset
|
697 |
ShutdownGame(); |
1036
8a82ce28b724
(svn r1537) -Fix: Close all and any open filehandles open at shutdown (tamlin)
darkvater
parents:
1035
diff
changeset
|
698 |
|
0 | 699 |
return 0; |
700 |
} |
|
701 |
||
6247 | 702 |
void HandleExitGameRequest() |
4548
6165e12570bf
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
703 |
{ |
6165e12570bf
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
704 |
if (_game_mode == GM_MENU) { // do not ask to quit on the main screen |
6165e12570bf
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
705 |
_exit_game = true; |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
706 |
} else if (_settings_client.gui.autosave_on_exit) { |
4548
6165e12570bf
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
707 |
DoExitSave(); |
6165e12570bf
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
708 |
_exit_game = true; |
6165e12570bf
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
709 |
} else { |
6165e12570bf
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
710 |
AskExitGame(); |
6165e12570bf
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
711 |
} |
6165e12570bf
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
712 |
} |
6165e12570bf
(svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents:
4537
diff
changeset
|
713 |
|
0 | 714 |
static void ShowScreenshotResult(bool b) |
715 |
{ |
|
716 |
if (b) { |
|
2055
4926ed1a7562
(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
|
717 |
SetDParamStr(0, _screenshot_name); |
0 | 718 |
ShowErrorMessage(INVALID_STRING_ID, STR_031B_SCREENSHOT_SUCCESSFULLY, 0, 0); |
719 |
} else { |
|
720 |
ShowErrorMessage(INVALID_STRING_ID, STR_031C_SCREENSHOT_FAILED, 0, 0); |
|
721 |
} |
|
722 |
||
723 |
} |
|
724 |
||
6247 | 725 |
static void MakeNewGameDone() |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
726 |
{ |
9617
10425da018ff
(svn r13673) -Fix [FS#2122]: desync when building electrified trains on a dedicated server that was started with electrification disabled.
rubidium
parents:
9533
diff
changeset
|
727 |
SettingsDisableElrail(_settings_game.vehicle.disable_elrails); |
10425da018ff
(svn r13673) -Fix [FS#2122]: desync when building electrified trains on a dedicated server that was started with electrification disabled.
rubidium
parents:
9533
diff
changeset
|
728 |
|
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
729 |
/* In a dedicated server, the server does not play */ |
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
730 |
if (_network_dedicated) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
731 |
SetLocalCompany(COMPANY_SPECTATOR); |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
732 |
return; |
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
733 |
} |
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
734 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
735 |
/* Create a single company */ |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
736 |
DoStartupNewCompany(false); |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
737 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
738 |
SetLocalCompany(COMPANY_FIRST); |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
739 |
_current_company = _local_company; |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
740 |
DoCommandP(0, (_settings_client.gui.autorenew << 15 ) | (_settings_client.gui.autorenew_months << 16) | 4, _settings_client.gui.autorenew_money, NULL, CMD_SET_AUTOREPLACE); |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
741 |
|
8809
e0d09d74e805
(svn r12550) -Change: the signal GUI is now persistent - has the same data when it is reopened
smatz
parents:
8790
diff
changeset
|
742 |
InitializeRailGUI(); |
5116
3c0c3da214ca
(svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
KUDr
parents:
5108
diff
changeset
|
743 |
|
8247
16e1c8db6f55
(svn r11811) -Fix: make compilation without networking work again (and thus move the debugdumpcommand stuff out of the network 'area').
rubidium
parents:
8224
diff
changeset
|
744 |
#ifdef ENABLE_NETWORK |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
745 |
/* We are the server, we start a new company (not dedicated), |
7998
9cf9f9153262
(svn r11556) -Feature: allow setting a default password for new companies in network games.
rubidium
parents:
7981
diff
changeset
|
746 |
* so set the default password *if* needed. */ |
9420
8a38703928e8
(svn r13334) -Codechange: move the network settings variables from network/network_internal to settings.
rubidium
parents:
9413
diff
changeset
|
747 |
if (_network_server && !StrEmpty(_settings_client.network.default_company_pass)) { |
8a38703928e8
(svn r13334) -Codechange: move the network settings variables from network/network_internal to settings.
rubidium
parents:
9413
diff
changeset
|
748 |
char *password = _settings_client.network.default_company_pass; |
7998
9cf9f9153262
(svn r11556) -Feature: allow setting a default password for new companies in network games.
rubidium
parents:
7981
diff
changeset
|
749 |
NetworkChangeCompanyPassword(1, &password); |
9cf9f9153262
(svn r11556) -Feature: allow setting a default password for new companies in network games.
rubidium
parents:
7981
diff
changeset
|
750 |
} |
8247
16e1c8db6f55
(svn r11811) -Fix: make compilation without networking work again (and thus move the debugdumpcommand stuff out of the network 'area').
rubidium
parents:
8224
diff
changeset
|
751 |
#endif /* ENABLE_NETWORK */ |
7998
9cf9f9153262
(svn r11556) -Feature: allow setting a default password for new companies in network games.
rubidium
parents:
7981
diff
changeset
|
752 |
|
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
753 |
MarkWholeScreenDirty(); |
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
754 |
} |
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
755 |
|
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
756 |
static void MakeNewGame(bool from_heightmap) |
0 | 757 |
{ |
758 |
_game_mode = GM_NORMAL; |
|
759 |
||
5313
92e5a28568c0
(svn r7469) -Fix (r7348): NewGRF settings weren't loaded in cases.
peter1138
parents:
5296
diff
changeset
|
760 |
ResetGRFConfig(true); |
6629
eba0ac353e4d
(svn r9850) -Codechange: Introduction of the Override/Substitute manager. Currently only used for newhouses.
belugas
parents:
6626
diff
changeset
|
761 |
_house_mngr.ResetMapping(); |
7152
89373fa66dc5
(svn r10426) -Codechange: Activate the reset of industry/tiles mapping upon initialization or new game.
belugas
parents:
7091
diff
changeset
|
762 |
_industile_mngr.ResetMapping(); |
89373fa66dc5
(svn r10426) -Codechange: Activate the reset of industry/tiles mapping upon initialization or new game.
belugas
parents:
7091
diff
changeset
|
763 |
_industry_mngr.ResetMapping(); |
5313
92e5a28568c0
(svn r7469) -Fix (r7348): NewGRF settings weren't loaded in cases.
peter1138
parents:
5296
diff
changeset
|
764 |
|
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
765 |
GenerateWorldSetCallback(&MakeNewGameDone); |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
766 |
GenerateWorld(from_heightmap ? GW_HEIGHTMAP : GW_NEWGAME, 1 << _settings_game.game_creation.map_x, 1 << _settings_game.game_creation.map_y); |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
767 |
} |
0 | 768 |
|
6247 | 769 |
static void MakeNewEditorWorldDone() |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
770 |
{ |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
771 |
SetLocalCompany(OWNER_NONE); |
0 | 772 |
|
773 |
MarkWholeScreenDirty(); |
|
774 |
} |
|
775 |
||
6247 | 776 |
static void MakeNewEditorWorld() |
0 | 777 |
{ |
778 |
_game_mode = GM_EDITOR; |
|
779 |
||
5313
92e5a28568c0
(svn r7469) -Fix (r7348): NewGRF settings weren't loaded in cases.
peter1138
parents:
5296
diff
changeset
|
780 |
ResetGRFConfig(true); |
92e5a28568c0
(svn r7469) -Fix (r7348): NewGRF settings weren't loaded in cases.
peter1138
parents:
5296
diff
changeset
|
781 |
|
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
782 |
GenerateWorldSetCallback(&MakeNewEditorWorldDone); |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
783 |
GenerateWorld(GW_EMPTY, 1 << _settings_game.game_creation.map_x, 1 << _settings_game.game_creation.map_y); |
0 | 784 |
} |
785 |
||
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
786 |
void StartupCompanies(); |
6247 | 787 |
void StartupDisasters(); |
788 |
extern void StartupEconomy(); |
|
116
ca4332a9ec1d
(svn r117) Feature: Performance details window in company league menu (TrueLight)
dominik
parents:
115
diff
changeset
|
789 |
|
1500
a66721629bc0
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
790 |
/** |
a66721629bc0
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
791 |
* Start Scenario starts a new game based on a scenario. |
a66721629bc0
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
792 |
* Eg 'New Game' --> select a preset scenario |
1501
0fc808b4e375
(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
|
793 |
* This starts a scenario based on your current difficulty settings |
1500
a66721629bc0
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
794 |
*/ |
6247 | 795 |
static void StartScenario() |
0 | 796 |
{ |
797 |
_game_mode = GM_NORMAL; |
|
798 |
||
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
799 |
/* invalid type */ |
0 | 800 |
if (_file_to_saveload.mode == SL_INVALID) { |
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5376
diff
changeset
|
801 |
DEBUG(sl, 0, "Savegame is obsolete or invalid format: '%s'", _file_to_saveload.name); |
9648
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9625
diff
changeset
|
802 |
SetDParam(0, STR_JUST_RAW_STRING); |
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9625
diff
changeset
|
803 |
SetDParamStr(1, GetSaveLoadErrorString()); |
7036
f1e26f21aa08
(svn r10300) -Fix [FS#917]: give a better explanation why the loading of a savegame failed and do not crash on loading savegames that were altered by patches or branches.
rubidium
parents:
7018
diff
changeset
|
804 |
ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); |
0 | 805 |
_game_mode = GM_MENU; |
806 |
return; |
|
807 |
} |
|
808 |
||
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
809 |
/* Reinitialize windows */ |
1474
a26a21fa10ef
(svn r1978) - Fix: Plug some memleaks; thanks Valgrind
Darkvater
parents:
1440
diff
changeset
|
810 |
ResetWindowSystem(); |
0 | 811 |
|
812 |
SetupColorsAndInitialWindow(); |
|
813 |
||
5313
92e5a28568c0
(svn r7469) -Fix (r7348): NewGRF settings weren't loaded in cases.
peter1138
parents:
5296
diff
changeset
|
814 |
ResetGRFConfig(true); |
92e5a28568c0
(svn r7469) -Fix (r7348): NewGRF settings weren't loaded in cases.
peter1138
parents:
5296
diff
changeset
|
815 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
816 |
/* Load game */ |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
817 |
if (SaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, SCENARIO_DIR) != SL_OK) { |
0 | 818 |
LoadIntroGame(); |
9648
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9625
diff
changeset
|
819 |
SetDParam(0, STR_JUST_RAW_STRING); |
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9625
diff
changeset
|
820 |
SetDParamStr(1, GetSaveLoadErrorString()); |
7036
f1e26f21aa08
(svn r10300) -Fix [FS#917]: give a better explanation why the loading of a savegame failed and do not crash on loading savegames that were altered by patches or branches.
rubidium
parents:
7018
diff
changeset
|
821 |
ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); |
0 | 822 |
} |
823 |
||
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
824 |
_settings_game.difficulty = _settings_newgame.difficulty; |
1500
a66721629bc0
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
825 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
826 |
/* Inititalize data */ |
3891
ca6cdf4f79bf
(svn r4947) - Fix [FS#145]: Starting scenarios did not adhere to local difficulty settings
Darkvater
parents:
3889
diff
changeset
|
827 |
StartupEconomy(); |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
828 |
StartupCompanies(); |
115
3a3c64e7be82
(svn r116) Fix: [ 963056 ] Wrong trains you can buy with scenarios
dominik
parents:
105
diff
changeset
|
829 |
StartupEngines(); |
3a3c64e7be82
(svn r116) Fix: [ 963056 ] Wrong trains you can buy with scenarios
dominik
parents:
105
diff
changeset
|
830 |
StartupDisasters(); |
3a3c64e7be82
(svn r116) Fix: [ 963056 ] Wrong trains you can buy with scenarios
dominik
parents:
105
diff
changeset
|
831 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
832 |
SetLocalCompany(COMPANY_FIRST); |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
833 |
_current_company = _local_company; |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
834 |
DoCommandP(0, (_settings_client.gui.autorenew << 15 ) | (_settings_client.gui.autorenew_months << 16) | 4, _settings_client.gui.autorenew_money, NULL, CMD_SET_AUTOREPLACE); |
0 | 835 |
|
836 |
MarkWholeScreenDirty(); |
|
837 |
} |
|
838 |
||
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
839 |
/** Load the specified savegame but on error do different things. |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
840 |
* If loading fails due to corrupt savegame, bad version, etc. go back to |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
841 |
* a previous correct state. In the menu for example load the intro game again. |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
842 |
* @param filename file to be loaded |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
843 |
* @param mode mode of loading, either SL_LOAD or SL_OLD_LOAD |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
844 |
* @param newgm switch to this mode of loading fails due to some unknown error |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
845 |
* @param subdir default directory to look for filename, set to 0 if not needed |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
846 |
*/ |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
847 |
bool SafeSaveOrLoad(const char *filename, int mode, int newgm, Subdirectory subdir) |
0 | 848 |
{ |
849 |
byte ogm = _game_mode; |
|
850 |
||
851 |
_game_mode = newgm; |
|
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
852 |
assert(mode == SL_LOAD || mode == SL_OLD_LOAD); |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
853 |
switch (SaveOrLoad(filename, mode, subdir)) { |
3024 | 854 |
case SL_OK: return true; |
855 |
||
856 |
case SL_REINIT: |
|
857 |
switch (ogm) { |
|
8619
06f3f9fd97d4
(svn r12202) -Fix: When loading a savegame fails, don't start creating a new game, just go straight back to the intro screen.
peter1138
parents:
8613
diff
changeset
|
858 |
default: |
3024 | 859 |
case GM_MENU: LoadIntroGame(); break; |
860 |
case GM_EDITOR: MakeNewEditorWorld(); break; |
|
861 |
} |
|
862 |
return false; |
|
863 |
||
864 |
default: |
|
865 |
_game_mode = ogm; |
|
866 |
return false; |
|
2639 | 867 |
} |
0 | 868 |
} |
869 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
870 |
void SwitchMode(int new_mode) |
0 | 871 |
{ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
872 |
#ifdef ENABLE_NETWORK |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
873 |
/* If we are saving something, the network stays in his current state */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
874 |
if (new_mode != SM_SAVE) { |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
875 |
/* If the network is active, make it not-active */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
876 |
if (_networking) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
877 |
if (_network_server && (new_mode == SM_LOAD || new_mode == SM_NEWGAME)) { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
878 |
NetworkReboot(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
879 |
} else { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
880 |
NetworkDisconnect(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
881 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
882 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
883 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
884 |
/* If we are a server, we restart the server */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
885 |
if (_is_network_server) { |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
886 |
/* But not if we are going to the menu */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
887 |
if (new_mode != SM_MENU) { |
8265
86530c22f883
(svn r11829) -Feature: allow reloading openttd.cfg when starting a new game on a dedicated server. Patch by dihedral.
rubidium
parents:
8264
diff
changeset
|
888 |
/* check if we should reload the config */ |
9420
8a38703928e8
(svn r13334) -Codechange: move the network settings variables from network/network_internal to settings.
rubidium
parents:
9413
diff
changeset
|
889 |
if (_settings_client.network.reload_cfg) { |
8265
86530c22f883
(svn r11829) -Feature: allow reloading openttd.cfg when starting a new game on a dedicated server. Patch by dihedral.
rubidium
parents:
8264
diff
changeset
|
890 |
LoadFromConfig(); |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
891 |
_settings_game = _settings_newgame; |
8265
86530c22f883
(svn r11829) -Feature: allow reloading openttd.cfg when starting a new game on a dedicated server. Patch by dihedral.
rubidium
parents:
8264
diff
changeset
|
892 |
ResetGRFConfig(false); |
86530c22f883
(svn r11829) -Feature: allow reloading openttd.cfg when starting a new game on a dedicated server. Patch by dihedral.
rubidium
parents:
8264
diff
changeset
|
893 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
894 |
NetworkServerStart(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
895 |
} else { |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
896 |
/* This client no longer wants to be a network-server */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
897 |
_is_network_server = false; |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
898 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
899 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
900 |
} |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
901 |
#endif /* ENABLE_NETWORK */ |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
902 |
|
1500
a66721629bc0
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
Darkvater
parents:
1496
diff
changeset
|
903 |
switch (new_mode) { |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
904 |
case SM_EDITOR: /* Switch to scenario editor */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
905 |
MakeNewEditorWorld(); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
906 |
break; |
0 | 907 |
|
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
908 |
case SM_NEWGAME: /* New Game --> 'Random game' */ |
630
3eb6abf08860
(svn r1061) -Fix: [Network] Compiling without ENABLE_NETWORK now works again correctly
truelight
parents:
614
diff
changeset
|
909 |
#ifdef ENABLE_NETWORK |
2951 | 910 |
if (_network_server) { |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
911 |
snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "Random Map"); |
2951 | 912 |
} |
630
3eb6abf08860
(svn r1061) -Fix: [Network] Compiling without ENABLE_NETWORK now works again correctly
truelight
parents:
614
diff
changeset
|
913 |
#endif /* ENABLE_NETWORK */ |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
914 |
MakeNewGame(false); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
915 |
break; |
0 | 916 |
|
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
917 |
case SM_START_SCENARIO: /* New Game --> Choose one of the preset scenarios */ |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
918 |
#ifdef ENABLE_NETWORK |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
919 |
if (_network_server) { |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
920 |
snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Loaded scenario)", _file_to_saveload.title); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
921 |
} |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
922 |
#endif /* ENABLE_NETWORK */ |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
923 |
StartScenario(); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
924 |
break; |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
925 |
|
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
926 |
case SM_LOAD: { /* Load game, Play Scenario */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
927 |
ResetGRFConfig(true); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
928 |
ResetWindowSystem(); |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
929 |
|
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
930 |
if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL, NO_DIRECTORY)) { |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
931 |
LoadIntroGame(); |
9648
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9625
diff
changeset
|
932 |
SetDParam(0, STR_JUST_RAW_STRING); |
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9625
diff
changeset
|
933 |
SetDParamStr(1, GetSaveLoadErrorString()); |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
934 |
ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
935 |
} else { |
9089
d37b68aff65d
(svn r12948) -Fix [FS#1982]: all vehicles would be available when an original scenario would be played.
rubidium
parents:
9085
diff
changeset
|
936 |
if (_saveload_mode == SLD_LOAD_SCENARIO) { |
d37b68aff65d
(svn r12948) -Fix [FS#1982]: all vehicles would be available when an original scenario would be played.
rubidium
parents:
9085
diff
changeset
|
937 |
StartupEngines(); |
d37b68aff65d
(svn r12948) -Fix [FS#1982]: all vehicles would be available when an original scenario would be played.
rubidium
parents:
9085
diff
changeset
|
938 |
} |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
939 |
/* Update the local company for a loaded game. It is either always |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
940 |
* company #1 (eg 0) or in the case of a dedicated server a spectator */ |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
941 |
SetLocalCompany(_network_dedicated ? COMPANY_SPECTATOR : COMPANY_FIRST); |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
942 |
/* Decrease pause counter (was increased from opening load dialog) */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
943 |
DoCommandP(0, 0, 0, NULL, CMD_PAUSE); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
944 |
#ifdef ENABLE_NETWORK |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
945 |
if (_network_server) { |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
946 |
snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Loaded game)", _file_to_saveload.title); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
947 |
} |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
948 |
#endif /* ENABLE_NETWORK */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
949 |
} |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
950 |
break; |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
951 |
} |
0 | 952 |
|
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
953 |
case SM_START_HEIGHTMAP: /* Load a heightmap and start a new game from it */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
954 |
#ifdef ENABLE_NETWORK |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
955 |
if (_network_server) { |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
956 |
snprintf(_network_game_info.map_name, lengthof(_network_game_info.map_name), "%s (Heightmap)", _file_to_saveload.title); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
957 |
} |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
958 |
#endif /* ENABLE_NETWORK */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
959 |
MakeNewGame(true); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
960 |
break; |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
961 |
|
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
962 |
case SM_LOAD_HEIGHTMAP: /* Load heightmap from scenario editor */ |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
963 |
SetLocalCompany(OWNER_NONE); |
0 | 964 |
|
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
965 |
GenerateWorld(GW_HEIGHTMAP, 1 << _settings_game.game_creation.map_x, 1 << _settings_game.game_creation.map_y); |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
966 |
MarkWholeScreenDirty(); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
967 |
break; |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
968 |
|
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
969 |
case SM_LOAD_SCENARIO: { /* Load scenario from scenario editor */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
970 |
if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR, NO_DIRECTORY)) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
971 |
SetLocalCompany(OWNER_NONE); |
9354
845e07db4549
(svn r13251) -Codechange: rename _patches to _settings as that is more logic.
rubidium
parents:
9346
diff
changeset
|
972 |
_settings_newgame.game_creation.starting_year = _cur_year; |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
973 |
} else { |
9648
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9625
diff
changeset
|
974 |
SetDParam(0, STR_JUST_RAW_STRING); |
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9625
diff
changeset
|
975 |
SetDParamStr(1, GetSaveLoadErrorString()); |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
976 |
ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
977 |
} |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
978 |
break; |
2639 | 979 |
} |
0 | 980 |
|
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
981 |
case SM_MENU: /* Switch to game intro menu */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
982 |
LoadIntroGame(); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
983 |
break; |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
984 |
|
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
985 |
case SM_SAVE: /* Save game */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
986 |
/* Make network saved games on pause compatible to singleplayer */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
987 |
if (_networking && _pause_game == 1) _pause_game = 2; |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
988 |
if (SaveOrLoad(_file_to_saveload.name, SL_SAVE, NO_DIRECTORY) != SL_OK) { |
9648
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9625
diff
changeset
|
989 |
SetDParam(0, STR_JUST_RAW_STRING); |
c79160082c0f
(svn r13715) -Fix [FS#2129]: C-like strings had to be rebound each time they were printed, otherwise the text could change due to the few number of slots that could be used to bind.
rubidium
parents:
9625
diff
changeset
|
990 |
SetDParamStr(1, GetSaveLoadErrorString()); |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
991 |
ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
992 |
} else { |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
993 |
DeleteWindowById(WC_SAVELOAD, 0); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
994 |
} |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
995 |
if (_networking && _pause_game == 2) _pause_game = 1; |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
996 |
break; |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
997 |
|
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
998 |
case SM_GENRANDLAND: /* Generate random land within scenario editor */ |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
999 |
SetLocalCompany(OWNER_NONE); |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
1000 |
GenerateWorld(GW_RANDOM, 1 << _settings_game.game_creation.map_x, 1 << _settings_game.game_creation.map_y); |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1001 |
/* XXX: set date */ |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1002 |
MarkWholeScreenDirty(); |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1003 |
break; |
0 | 1004 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1005 |
|
2951 | 1006 |
if (_switch_mode_errorstr != INVALID_STRING_ID) { |
1007 |
ShowErrorMessage(INVALID_STRING_ID, _switch_mode_errorstr, 0, 0); |
|
1008 |
} |
|
0 | 1009 |
} |
1010 |
||
1011 |
||
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1012 |
/** |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1013 |
* State controlling game loop. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1014 |
* The state must not be changed from anywhere but here. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1015 |
* That check is enforced in DoCommand. |
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1016 |
*/ |
6247 | 1017 |
void StateGameLoop() |
0 | 1018 |
{ |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1019 |
/* dont execute the state loop during pause */ |
8179
60c4282e6de6
(svn r11742) -Codechange [FS#1319]: Run window tick events when paused, so that news pop-ups and the about window still progress. For other windows the events are ignored when paused.
peter1138
parents:
8172
diff
changeset
|
1020 |
if (_pause_game) { |
60c4282e6de6
(svn r11742) -Codechange [FS#1319]: Run window tick events when paused, so that news pop-ups and the about window still progress. For other windows the events are ignored when paused.
peter1138
parents:
8172
diff
changeset
|
1021 |
CallWindowTickEvent(); |
60c4282e6de6
(svn r11742) -Codechange [FS#1319]: Run window tick events when paused, so that news pop-ups and the about window still progress. For other windows the events are ignored when paused.
peter1138
parents:
8172
diff
changeset
|
1022 |
return; |
60c4282e6de6
(svn r11742) -Codechange [FS#1319]: Run window tick events when paused, so that news pop-ups and the about window still progress. For other windows the events are ignored when paused.
peter1138
parents:
8172
diff
changeset
|
1023 |
} |
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
1024 |
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
|
1025 |
|
8303
cbb07f7426fc
(svn r11867) -Fix: do not reset changes to persistent storages during world generation.
rubidium
parents:
8291
diff
changeset
|
1026 |
ClearStorageChanges(false); |
cbb07f7426fc
(svn r11867) -Fix: do not reset changes to persistent storages during world generation.
rubidium
parents:
8291
diff
changeset
|
1027 |
|
0 | 1028 |
if (_game_mode == GM_EDITOR) { |
1029 |
RunTileLoop(); |
|
1030 |
CallVehicleTicks(); |
|
1031 |
CallLandscapeTick(); |
|
8303
cbb07f7426fc
(svn r11867) -Fix: do not reset changes to persistent storages during world generation.
rubidium
parents:
8291
diff
changeset
|
1032 |
ClearStorageChanges(true); |
cbb07f7426fc
(svn r11867) -Fix: do not reset changes to persistent storages during world generation.
rubidium
parents:
8291
diff
changeset
|
1033 |
|
0 | 1034 |
CallWindowTickEvent(); |
1035 |
NewsLoop(); |
|
1036 |
} else { |
|
9039
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1037 |
#ifdef DEBUG_DUMP_COMMANDS |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1038 |
Vehicle *v; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1039 |
FOR_ALL_VEHICLES(v) { |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1040 |
if (v != v->First()) continue; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1041 |
|
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1042 |
switch (v->type) { |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1043 |
case VEH_ROAD: { |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1044 |
extern byte GetRoadVehLength(const Vehicle *v); |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1045 |
if (GetRoadVehLength(v) != v->u.road.cached_veh_length) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1046 |
printf("cache mismatch: vehicle %i, company %i, unit number %i\n", v->index, (int)v->owner, v->unitnumber); |
9039
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1047 |
} |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1048 |
} break; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1049 |
|
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1050 |
case VEH_TRAIN: { |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1051 |
uint length = 0; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1052 |
for (Vehicle *u = v; u != NULL; u = u->Next()) length++; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1053 |
|
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1054 |
VehicleRail *wagons = MallocT<VehicleRail>(length); |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1055 |
length = 0; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1056 |
for (Vehicle *u = v; u != NULL; u = u->Next()) wagons[length++] = u->u.rail; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1057 |
|
9704
54123af5f9a5
(svn r13816) -Fix [FS#2150]: check for vehicle length changes outside a depot (callback 0x11) and give a warning about that
smatz
parents:
9667
diff
changeset
|
1058 |
TrainConsistChanged(v, true); |
9039
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1059 |
|
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1060 |
length = 0; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1061 |
for (Vehicle *u = v; u != NULL; u = u->Next()) { |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1062 |
if (memcmp(&wagons[length], &u->u.rail, sizeof(VehicleRail)) != 0) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1063 |
printf("cache mismatch: vehicle %i, company %i, unit number %i, wagon %i\n", v->index, (int)v->owner, v->unitnumber, length); |
9039
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1064 |
} |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1065 |
length++; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1066 |
} |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1067 |
|
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1068 |
free(wagons); |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1069 |
} break; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1070 |
|
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1071 |
case VEH_AIRCRAFT: { |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1072 |
uint speed = v->u.air.cached_max_speed; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1073 |
UpdateAircraftCache(v); |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1074 |
if (speed != v->u.air.cached_max_speed) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1075 |
printf("cache mismatch: vehicle %i, company %i, unit number %i\n", v->index, (int)v->owner, v->unitnumber); |
9039
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1076 |
} |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1077 |
} break; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1078 |
|
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1079 |
default: |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1080 |
break; |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1081 |
} |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1082 |
} |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1083 |
#endif |
480ed3fad6ce
(svn r12858) -Add: small piece of code that can help hunting desyncs. Has to be enabled by --enable-desync-debug=1 though.
rubidium
parents:
9029
diff
changeset
|
1084 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1085 |
/* All these actions has to be done from OWNER_NONE |
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1086 |
* for multiplayer compatibility */ |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1087 |
CompanyID old_company = _current_company; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1088 |
_current_company = OWNER_NONE; |
206 | 1089 |
|
0 | 1090 |
AnimateAnimatedTiles(); |
1091 |
IncreaseDate(); |
|
1092 |
RunTileLoop(); |
|
1093 |
CallVehicleTicks(); |
|
1094 |
CallLandscapeTick(); |
|
8303
cbb07f7426fc
(svn r11867) -Fix: do not reset changes to persistent storages during world generation.
rubidium
parents:
8291
diff
changeset
|
1095 |
ClearStorageChanges(true); |
0 | 1096 |
|
2395
d1629f64d157
(svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c)
truelight
parents:
2383
diff
changeset
|
1097 |
AI_RunGameLoop(); |
0 | 1098 |
|
1099 |
CallWindowTickEvent(); |
|
1100 |
NewsLoop(); |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1101 |
_current_company = old_company; |
0 | 1102 |
} |
1103 |
} |
|
1104 |
||
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
1105 |
/** Create an autosave. The default name is "autosave#.sav". However with |
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
1106 |
* the patch setting 'keep_all_autosave' the name defaults to company-name + date */ |
6247 | 1107 |
static void DoAutosave() |
0 | 1108 |
{ |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
1109 |
char buf[MAX_PATH]; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1110 |
|
5977
3419c6dfa9ec
(svn r8675) [PSP] -Fix: don't autosave in networking for PSP, to time expensive
truelight
parents:
5959
diff
changeset
|
1111 |
#if defined(PSP) |
3419c6dfa9ec
(svn r8675) [PSP] -Fix: don't autosave in networking for PSP, to time expensive
truelight
parents:
5959
diff
changeset
|
1112 |
/* Autosaving in networking is too time expensive for the PSP */ |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1113 |
if (_networking) return; |
5977
3419c6dfa9ec
(svn r8675) [PSP] -Fix: don't autosave in networking for PSP, to time expensive
truelight
parents:
5959
diff
changeset
|
1114 |
#endif /* PSP */ |
3419c6dfa9ec
(svn r8675) [PSP] -Fix: don't autosave in networking for PSP, to time expensive
truelight
parents:
5959
diff
changeset
|
1115 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1116 |
if (_settings_client.gui.keep_all_autosave && _local_company != COMPANY_SPECTATOR) { |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1117 |
SetDParam(0, _local_company); |
7058
8105bb13ce3d
(svn r10323) -Codechange: reference company name, number and player (president) name
peter1138
parents:
7036
diff
changeset
|
1118 |
SetDParam(1, _date); |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
1119 |
GetString(buf, STR_4004, lastof(buf)); |
10310
ca2eb5811a07
(svn r14555) -Codechange: replace ttd_strlcat and ttd_strlcpy with strecat and strecpy where direct conversion is possible
skidd13
parents:
10299
diff
changeset
|
1120 |
strecat(buf, ".sav", lastof(buf)); |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
1121 |
} else { |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
1122 |
/* generate a savegame name and number according to _settings_client.gui.max_num_autosaves */ |
6929
56470c1b8a66
(svn r10182) -Codechange: rewrite most part of the file loading/searching to be more flexible.
rubidium
parents:
6928
diff
changeset
|
1123 |
snprintf(buf, sizeof(buf), "autosave%d.sav", _autosave_ctr); |
2672
35122f8a44ab
(svn r3214) -Feature: openttd.cfg can now set how many autosaves to keep before starting to overwrite old ones
bjarni
parents:
2670
diff
changeset
|
1124 |
|
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
1125 |
if (++_autosave_ctr >= _settings_client.gui.max_num_autosaves) _autosave_ctr = 0; |
0 | 1126 |
} |
1127 |
||
5380
8ea58542b6e0
(svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents:
5376
diff
changeset
|
1128 |
DEBUG(sl, 2, "Autosaving to '%s'", buf); |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1129 |
if (SaveOrLoad(buf, SL_SAVE, AUTOSAVE_DIR) != SL_OK) { |
0 | 1130 |
ShowErrorMessage(INVALID_STRING_ID, STR_AUTOSAVE_FAILED, 0, 0); |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1131 |
} |
0 | 1132 |
} |
1133 |
||
6247 | 1134 |
void GameLoop() |
0 | 1135 |
{ |
8989
42f45270fbca
(svn r12784) -Codechange: handle the asynchronious save 'handlers' in saveload.cpp instead of openttd.cpp.
rubidium
parents:
8987
diff
changeset
|
1136 |
ProcessAsyncSaveFinish(); |
0 | 1137 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1138 |
/* autosave game? */ |
0 | 1139 |
if (_do_autosave) { |
1140 |
_do_autosave = false; |
|
1141 |
DoAutosave(); |
|
1142 |
RedrawAutosave(); |
|
1143 |
} |
|
1144 |
||
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1145 |
/* make a screenshot? */ |
4184
541f819f2125
(svn r5626) CodeChange : Remove the global _make_screenshot and implement a more flexible mechanism
belugas
parents:
4171
diff
changeset
|
1146 |
if (IsScreenshotRequested()) ShowScreenshotResult(MakeScreenshot()); |
0 | 1147 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1148 |
/* switch game mode? */ |
3024 | 1149 |
if (_switch_mode != SM_NONE) { |
1150 |
SwitchMode(_switch_mode); |
|
0 | 1151 |
_switch_mode = SM_NONE; |
1152 |
} |
|
1153 |
||
1154 |
IncreaseSpriteLRU(); |
|
1155 |
InteractiveRandom(); |
|
1156 |
||
1157 |
_caret_timer += 3; |
|
7018
71e174292e42
(svn r10276) -Codechange: made a counter based on milliseconds and independent of the game-state to base double-click and TGP Generation Process on
truelight
parents:
7012
diff
changeset
|
1158 |
_palette_animation_counter += 8; |
0 | 1159 |
CursorTick(); |
1160 |
||
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1161 |
#ifdef ENABLE_NETWORK |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1162 |
/* Check for UDP stuff */ |
4830
668bcb0a30b2
(svn r6754) -Codechange: Remove some #idef ENABLE_NETWORK specific defines. With networking
Darkvater
parents:
4829
diff
changeset
|
1163 |
if (_network_available) NetworkUDPGameLoop(); |
0 | 1164 |
|
4300
c7e43c47a2b9
(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents:
4293
diff
changeset
|
1165 |
if (_networking && !IsGeneratingWorld()) { |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1166 |
/* Multiplayer */ |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1167 |
NetworkGameLoop(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1168 |
} else { |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1169 |
if (_network_reconnect > 0 && --_network_reconnect == 0) { |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1170 |
/* This means that we want to reconnect to the last host |
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1171 |
* We do this here, because it means that the network is really closed */ |
9420
8a38703928e8
(svn r13334) -Codechange: move the network settings variables from network/network_internal to settings.
rubidium
parents:
9413
diff
changeset
|
1172 |
NetworkClientConnectGame(_settings_client.network.last_host, _settings_client.network.last_port); |
206 | 1173 |
} |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1174 |
/* Singleplayer */ |
213
770e504a6e51
(svn r214) -Feature: CMD_NET_INSTANT [just in time command handling over network] (sign_de)
darkvater
parents:
208
diff
changeset
|
1175 |
StateGameLoop(); |
0 | 1176 |
} |
543
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1177 |
#else |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1178 |
StateGameLoop(); |
946badd71033
(svn r942) -Merged branch/network back into the trunk
truelight
parents:
534
diff
changeset
|
1179 |
#endif /* ENABLE_NETWORK */ |
0 | 1180 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7922
diff
changeset
|
1181 |
if (!_pause_game && HasBit(_display_opt, DO_FULL_ANIMATION)) DoPaletteAnimations(); |
0 | 1182 |
|
6231
ff7454d35935
(svn r9034) -Codechange: renamed _pause to _pause_game, as some targets already have
truelight
parents:
6229
diff
changeset
|
1183 |
if (!_pause_game || _cheats.build_in_pause.value) MoveAllTextEffects(); |
0 | 1184 |
|
1570
c9b6cf44ce53
(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
|
1185 |
InputLoop(); |
0 | 1186 |
|
10380
f4adb9648a93
(svn r14631) -Add: support for Allegro as sound backend.
rubidium
parents:
10361
diff
changeset
|
1187 |
_sound_driver->MainLoop(); |
1608
70a3c1a6576d
(svn r2112) -Fix: ExtMidi no longer halts the game while starting a song
tron
parents:
1570
diff
changeset
|
1188 |
MusicLoop(); |
0 | 1189 |
} |
1190 |
||
6247 | 1191 |
static void ConvertTownOwner() |
0 | 1192 |
{ |
9069
3830e57f6346
(svn r12921) -Codechange: coding style fixes and documentation updates.
rubidium
parents:
9057
diff
changeset
|
1193 |
for (TileIndex tile = 0; tile != MapSize(); tile++) { |
4000
4009d092b306
(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
|
1194 |
switch (GetTileType(tile)) { |
7370
41adc721b1fa
(svn r10733) -Codechange: change MP_STREET into MP_ROAD as we use the word "road" everywhere except in the tile type.
rubidium
parents:
7272
diff
changeset
|
1195 |
case MP_ROAD: |
10167
b4bef78a1e24
(svn r14359) -Fix [FS#2311]: the ownership of roadtiles was not properly set for very old savegames (including TTD's) making it impossible to remove some pieces of road.
rubidium
parents:
10158
diff
changeset
|
1196 |
if (GB(_m[tile].m5, 4, 2) == ROAD_TILE_CROSSING && HasBit(_m[tile].m3, 7)) { |
b4bef78a1e24
(svn r14359) -Fix [FS#2311]: the ownership of roadtiles was not properly set for very old savegames (including TTD's) making it impossible to remove some pieces of road.
rubidium
parents:
10158
diff
changeset
|
1197 |
_m[tile].m3 = OWNER_TOWN; |
4000
4009d092b306
(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
|
1198 |
} |
4009d092b306
(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
|
1199 |
/* FALLTHROUGH */ |
0 | 1200 |
|
4000
4009d092b306
(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
|
1201 |
case MP_TUNNELBRIDGE: |
4009d092b306
(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
|
1202 |
if (GetTileOwner(tile) & 0x80) SetTileOwner(tile, OWNER_TOWN); |
4009d092b306
(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
|
1203 |
break; |
4009d092b306
(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
|
1204 |
|
4009d092b306
(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
|
1205 |
default: break; |
0 | 1206 |
} |
1207 |
} |
|
1208 |
} |
|
1209 |
||
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1210 |
/* since savegame version 4.1, exclusive transport rights are stored at towns */ |
6247 | 1211 |
static void UpdateExclusiveRights() |
121
c2f18f4d8be1
(svn r122) Change: exclusive transport rights are now stored per town instead of per station
dominik
parents:
116
diff
changeset
|
1212 |
{ |
4171 | 1213 |
Town *t; |
2639 | 1214 |
|
1215 |
FOR_ALL_TOWNS(t) { |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1216 |
t->exclusivity = INVALID_COMPANY; |
121
c2f18f4d8be1
(svn r122) Change: exclusive transport rights are now stored per town instead of per station
dominik
parents:
116
diff
changeset
|
1217 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1218 |
|
123
d550772c61e6
(svn r124) Prepared code for removal of block_months variable in next major savegame version
dominik
parents:
121
diff
changeset
|
1219 |
/* FIXME old exclusive rights status is not being imported (stored in s->blocked_months_obsolete) |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1220 |
* could be implemented this way: |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1221 |
* 1.) Go through all stations |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1222 |
* Build an array town_blocked[ town_id ][ company_id ] |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1223 |
* that stores if at least one station in that town is blocked for a company |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1224 |
* 2.) Go through that array, if you find a town that is not blocked for |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1225 |
* one company, but for all others, then give him exclusivity. |
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4548
diff
changeset
|
1226 |
*/ |
121
c2f18f4d8be1
(svn r122) Change: exclusive transport rights are now stored per town instead of per station
dominik
parents:
116
diff
changeset
|
1227 |
} |
c2f18f4d8be1
(svn r122) Change: exclusive transport rights are now stored per town instead of per station
dominik
parents:
116
diff
changeset
|
1228 |
|
2756 | 1229 |
static const byte convert_currency[] = { |
762
ef014856bd88
(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
|
1230 |
0, 1, 12, 8, 3, |
ef014856bd88
(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
|
1231 |
10, 14, 19, 4, 5, |
ef014856bd88
(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
|
1232 |
9, 11, 13, 6, 17, |
ef014856bd88
(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
|
1233 |
16, 22, 21, 7, 15, |
ef014856bd88
(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
|
1234 |
18, 2, 20, }; |
ef014856bd88
(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
|
1235 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1236 |
/* since savegame version 4.2 the currencies are arranged differently */ |
6247 | 1237 |
static void UpdateCurrencies() |
762
ef014856bd88
(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
|
1238 |
{ |
9466
5a1d4eb2ae07
(svn r13386) -Fix: global currency/units setting being overriden when loading a savegame.
rubidium
parents:
9457
diff
changeset
|
1239 |
_settings_game.locale.currency = convert_currency[_settings_game.locale.currency]; |
762
ef014856bd88
(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
|
1240 |
} |
ef014856bd88
(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
|
1241 |
|
1181
3cbae3ef2590
(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
|
1242 |
/* Up to revision 1413 the invisible tiles at the southern border have not been |
3cbae3ef2590
(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
|
1243 |
* MP_VOID, even though they should have. This is fixed by this function |
3cbae3ef2590
(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
|
1244 |
*/ |
6247 | 1245 |
static void UpdateVoidTiles() |
929
19096353d35c
(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
|
1246 |
{ |
959
e6a3bbda610f
(svn r1451) Fix some of the signed/unsigned comparison warnings
tron
parents:
950
diff
changeset
|
1247 |
uint i; |
1181
3cbae3ef2590
(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
|
1248 |
|
3075
fd64f71655eb
(svn r3664) Add a function to turn a tile into a void tile
tron
parents:
3059
diff
changeset
|
1249 |
for (i = 0; i < MapMaxY(); ++i) MakeVoid(i * MapSizeX() + MapMaxX()); |
fd64f71655eb
(svn r3664) Add a function to turn a tile into a void tile
tron
parents:
3059
diff
changeset
|
1250 |
for (i = 0; i < MapSizeX(); ++i) MakeVoid(MapSizeX() * MapMaxY() + i); |
929
19096353d35c
(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
|
1251 |
} |
19096353d35c
(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
|
1252 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1253 |
/* since savegame version 6.0 each sign has an "owner", signs without owner (from old games are set to 255) */ |
6247 | 1254 |
static void UpdateSignOwner() |
1165
8fa7d3e235c6
(svn r1667) - Feature: Signs are now shown in the color of the player who created them
dominik
parents:
1115
diff
changeset
|
1255 |
{ |
4349
1016170ae0cb
(svn r6050) -Codechange: mass-renamed SignStruct -> Sign and ss -> si. Now functions and variables all match eachother
truelight
parents:
4346
diff
changeset
|
1256 |
Sign *si; |
2639 | 1257 |
|
4349
1016170ae0cb
(svn r6050) -Codechange: mass-renamed SignStruct -> Sign and ss -> si. Now functions and variables all match eachother
truelight
parents:
4346
diff
changeset
|
1258 |
FOR_ALL_SIGNS(si) si->owner = OWNER_NONE; |
1165
8fa7d3e235c6
(svn r1667) - Feature: Signs are now shown in the color of the player who created them
dominik
parents:
1115
diff
changeset
|
1259 |
} |
8fa7d3e235c6
(svn r1667) - Feature: Signs are now shown in the color of the player who created them
dominik
parents:
1115
diff
changeset
|
1260 |
|
6247 | 1261 |
extern void UpdateOldAircraft(); |
0 | 1262 |
|
3656
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1263 |
|
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1264 |
static inline RailType UpdateRailType(RailType rt, RailType min) |
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1265 |
{ |
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1266 |
return rt >= min ? (RailType)(rt + 1): rt; |
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1267 |
} |
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1268 |
|
7981
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1269 |
/** |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1270 |
* Initialization of the windows and several kinds of caches. |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1271 |
* This is not done directly in AfterLoadGame because these |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1272 |
* functions require that all saveload conversions have been |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1273 |
* done. As people tend to add savegame conversion stuff after |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1274 |
* the intialization of the windows and caches quite some bugs |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1275 |
* had been made. |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1276 |
* Moving this out of there is both cleaner and less bug-prone. |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1277 |
* |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1278 |
* @return true if everything went according to plan, otherwise false. |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1279 |
*/ |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1280 |
static bool InitializeWindowsAndCaches() |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1281 |
{ |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1282 |
/* Initialize windows */ |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1283 |
ResetWindowSystem(); |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1284 |
SetupColorsAndInitialWindow(); |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1285 |
|
9410
b8cbfacc9057
(svn r13321) -Codechange: move some GUI/viewport related functions out op openttd.cpp to viewport.cpp/window.cpp.
rubidium
parents:
9387
diff
changeset
|
1286 |
extern void ResetViewportAfterLoadGame(); |
b8cbfacc9057
(svn r13321) -Codechange: move some GUI/viewport related functions out op openttd.cpp to viewport.cpp/window.cpp.
rubidium
parents:
9387
diff
changeset
|
1287 |
ResetViewportAfterLoadGame(); |
7981
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1288 |
|
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1289 |
/* Update coordinates of the signs. */ |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1290 |
UpdateAllStationVirtCoord(); |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1291 |
UpdateAllSignVirtCoords(); |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1292 |
UpdateAllTownVirtCoords(); |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1293 |
UpdateAllWaypointSigns(); |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1294 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1295 |
Company *c; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1296 |
FOR_ALL_COMPANIES(c) { |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1297 |
/* For each company, verify (while loading a scenario) that the inauguration date is the current year and set it |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1298 |
* accordingly if it is not the case. No need to set it on companies that are not been used already, |
9211
a7347659b84a
(svn r13077) -Codechange: move function that updates cached num_engines to engine.cpp, make it run only 1 loop
smatz
parents:
9200
diff
changeset
|
1299 |
* thus the MIN_YEAR (which is really nothing more than Zero, initialized value) test */ |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1300 |
if (_file_to_saveload.filetype == FT_SCENARIO && c->inaugurated_year != MIN_YEAR) { |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1301 |
c->inaugurated_year = _cur_year; |
7981
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1302 |
} |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1303 |
} |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1304 |
|
9211
a7347659b84a
(svn r13077) -Codechange: move function that updates cached num_engines to engine.cpp, make it run only 1 loop
smatz
parents:
9200
diff
changeset
|
1305 |
SetCachedEngineCounts(); |
7981
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1306 |
|
9334
28ac6c8e0795
(svn r13226) -Feature: Allow to have more than only two airports per town. The number of airports is now controlled by the noise each of them generates, the distance from town's center and how tolerant the town is.
belugas
parents:
9306
diff
changeset
|
1307 |
/* Towns have a noise controlled number of airports system |
28ac6c8e0795
(svn r13226) -Feature: Allow to have more than only two airports per town. The number of airports is now controlled by the noise each of them generates, the distance from town's center and how tolerant the town is.
belugas
parents:
9306
diff
changeset
|
1308 |
* So each airport's noise value must be added to the town->noise_reached value |
28ac6c8e0795
(svn r13226) -Feature: Allow to have more than only two airports per town. The number of airports is now controlled by the noise each of them generates, the distance from town's center and how tolerant the town is.
belugas
parents:
9306
diff
changeset
|
1309 |
* Reset each town's noise_reached value to '0' before. */ |
28ac6c8e0795
(svn r13226) -Feature: Allow to have more than only two airports per town. The number of airports is now controlled by the noise each of them generates, the distance from town's center and how tolerant the town is.
belugas
parents:
9306
diff
changeset
|
1310 |
UpdateAirportsNoise(); |
28ac6c8e0795
(svn r13226) -Feature: Allow to have more than only two airports per town. The number of airports is now controlled by the noise each of them generates, the distance from town's center and how tolerant the town is.
belugas
parents:
9306
diff
changeset
|
1311 |
|
9704
54123af5f9a5
(svn r13816) -Fix [FS#2150]: check for vehicle length changes outside a depot (callback 0x11) and give a warning about that
smatz
parents:
9667
diff
changeset
|
1312 |
CheckTrainsLengths(); |
54123af5f9a5
(svn r13816) -Fix [FS#2150]: check for vehicle length changes outside a depot (callback 0x11) and give a warning about that
smatz
parents:
9667
diff
changeset
|
1313 |
|
7981
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1314 |
return true; |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1315 |
} |
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
1316 |
|
6247 | 1317 |
bool AfterLoadGame() |
0 | 1318 |
{ |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1319 |
TileIndex map_size = MapSize(); |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1320 |
Company *c; |
988
4304525d1b8b
(svn r1486) -Codechange: moved all 'signs' stuff to signs.c/h and prepared it for
truelight
parents:
983
diff
changeset
|
1321 |
|
9457
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
9429
diff
changeset
|
1322 |
if (CheckSavegameVersion(98)) GamelogOldver(); |
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
9429
diff
changeset
|
1323 |
|
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
9429
diff
changeset
|
1324 |
GamelogTestRevision(); |
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
9429
diff
changeset
|
1325 |
GamelogTestMode(); |
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
9429
diff
changeset
|
1326 |
|
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
9429
diff
changeset
|
1327 |
if (CheckSavegameVersion(98)) GamelogGRFAddList(_grfconfig); |
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
9429
diff
changeset
|
1328 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1329 |
/* in version 2.1 of the savegame, town owner was unified. */ |
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1330 |
if (CheckSavegameVersionOldStyle(2, 1)) ConvertTownOwner(); |
0 | 1331 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1332 |
/* from version 4.1 of the savegame, exclusive rights are stored at towns */ |
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1333 |
if (CheckSavegameVersionOldStyle(4, 1)) UpdateExclusiveRights(); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1334 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1335 |
/* from version 4.2 of the savegame, currencies are in a different order */ |
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1336 |
if (CheckSavegameVersionOldStyle(4, 2)) UpdateCurrencies(); |
762
ef014856bd88
(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
|
1337 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1338 |
/* from version 6.1 of the savegame, signs have an "owner" */ |
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1339 |
if (CheckSavegameVersionOldStyle(6, 1)) UpdateSignOwner(); |
1165
8fa7d3e235c6
(svn r1667) - Feature: Signs are now shown in the color of the player who created them
dominik
parents:
1115
diff
changeset
|
1340 |
|
831
d706427d9e23
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1341 |
/* In old version there seems to be a problem that water is owned by |
8707
e57a09994e12
(svn r12381) -Fix [FS1835] [FS1535] (r11855): The number of houses wasn't computed right. A few other things regaring the updating had to be changed. Big thanks for support to frosch123 and SmatZ, to name just a few. (Inspired by a patch of bilbo)
skidd13
parents:
8681
diff
changeset
|
1342 |
* OWNER_NONE, not OWNER_WATER.. I can't replicate it for the current |
e57a09994e12
(svn r12381) -Fix [FS1835] [FS1535] (r11855): The number of houses wasn't computed right. A few other things regaring the updating had to be changed. Big thanks for support to frosch123 and SmatZ, to name just a few. (Inspired by a patch of bilbo)
skidd13
parents:
8681
diff
changeset
|
1343 |
* (4.3) version, so I just check when versions are older, and then |
e57a09994e12
(svn r12381) -Fix [FS1835] [FS1535] (r11855): The number of houses wasn't computed right. A few other things regaring the updating had to be changed. Big thanks for support to frosch123 and SmatZ, to name just a few. (Inspired by a patch of bilbo)
skidd13
parents:
8681
diff
changeset
|
1344 |
* walk through the whole map.. */ |
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1345 |
if (CheckSavegameVersionOldStyle(4, 3)) { |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1346 |
for (TileIndex t = 0; t < map_size; t++) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1347 |
if (IsTileType(t, MP_WATER) && GetTileOwner(t) >= MAX_COMPANIES) { |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1348 |
SetTileOwner(t, OWNER_WATER); |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1349 |
} |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1350 |
} |
831
d706427d9e23
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1351 |
} |
d706427d9e23
(svn r1302) -Fix: [ 1091655 ] In some older maps somehow water is owned by
truelight
parents:
802
diff
changeset
|
1352 |
|
8258
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1353 |
if (CheckSavegameVersion(84)) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1354 |
FOR_ALL_COMPANIES(c) { |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1355 |
c->name = CopyFromOldName(c->name_1); |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1356 |
if (c->name != NULL) c->name_1 = STR_SV_UNNAMED; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1357 |
c->president_name = CopyFromOldName(c->president_name_1); |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1358 |
if (c->president_name != NULL) c->president_name_1 = SPECSTR_PRESIDENT_NAME; |
8258
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1359 |
} |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1360 |
|
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1361 |
Station *st; |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1362 |
FOR_ALL_STATIONS(st) { |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1363 |
st->name = CopyFromOldName(st->string_id); |
10150
7f5047689c72
(svn r14336) -Fix (r14334): when there was a station with custom name in an old savegame, it's default name was empty
smatz
parents:
10106
diff
changeset
|
1364 |
/* generating new name would be too much work for little effect, use the station name fallback */ |
7f5047689c72
(svn r14336) -Fix (r14334): when there was a station with custom name in an old savegame, it's default name was empty
smatz
parents:
10106
diff
changeset
|
1365 |
if (st->name != NULL) st->string_id = STR_SV_STNAME_FALLBACK; |
8258
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1366 |
} |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1367 |
|
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1368 |
Town *t; |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1369 |
FOR_ALL_TOWNS(t) { |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1370 |
t->name = CopyFromOldName(t->townnametype); |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
1371 |
if (t->name != NULL) t->townnametype = SPECSTR_TOWNNAME_START + _settings_game.game_creation.town_name; |
8258
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1372 |
} |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1373 |
|
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1374 |
Waypoint *wp; |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1375 |
FOR_ALL_WAYPOINTS(wp) { |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1376 |
wp->name = CopyFromOldName(wp->string); |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1377 |
wp->string = STR_EMPTY; |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1378 |
} |
10153
4d982a782aa8
(svn r14340) -Fix (r11822): signs from old savegames were lost (causing little memory leaks)
smatz
parents:
10152
diff
changeset
|
1379 |
|
4d982a782aa8
(svn r14340) -Fix (r11822): signs from old savegames were lost (causing little memory leaks)
smatz
parents:
10152
diff
changeset
|
1380 |
for (uint i = 0; i < GetSignPoolSize(); i++) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1381 |
/* invalid signs are determined by si->ower == INVALID_COMPANY now */ |
10153
4d982a782aa8
(svn r14340) -Fix (r11822): signs from old savegames were lost (causing little memory leaks)
smatz
parents:
10152
diff
changeset
|
1382 |
Sign *si = GetSign(i); |
4d982a782aa8
(svn r14340) -Fix (r11822): signs from old savegames were lost (causing little memory leaks)
smatz
parents:
10152
diff
changeset
|
1383 |
if (!si->IsValid() && si->name != NULL) { |
4d982a782aa8
(svn r14340) -Fix (r11822): signs from old savegames were lost (causing little memory leaks)
smatz
parents:
10152
diff
changeset
|
1384 |
si->owner = OWNER_NONE; |
4d982a782aa8
(svn r14340) -Fix (r11822): signs from old savegames were lost (causing little memory leaks)
smatz
parents:
10152
diff
changeset
|
1385 |
} |
4d982a782aa8
(svn r14340) -Fix (r11822): signs from old savegames were lost (causing little memory leaks)
smatz
parents:
10152
diff
changeset
|
1386 |
} |
8258
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1387 |
} |
9fa31acb07bc
(svn r11822) -Codechange: Replaced fixed size custom name array. Names are now attached to their object directly and there is
peter1138
parents:
8254
diff
changeset
|
1388 |
|
8987
80d22b9c2a0c
(svn r12782) -Codechange: remove some functions from functions.h and do not statically 'waste' memory when the old name array is not needed anymore.
rubidium
parents:
8985
diff
changeset
|
1389 |
/* From this point the old names array is cleared. */ |
80d22b9c2a0c
(svn r12782) -Codechange: remove some functions from functions.h and do not statically 'waste' memory when the old name array is not needed anymore.
rubidium
parents:
8985
diff
changeset
|
1390 |
ResetOldNames(); |
80d22b9c2a0c
(svn r12782) -Codechange: remove some functions from functions.h and do not statically 'waste' memory when the old name array is not needed anymore.
rubidium
parents:
8985
diff
changeset
|
1391 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1392 |
/* convert road side to my format. */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
1393 |
if (_settings_game.vehicle.road_side) _settings_game.vehicle.road_side = 1; |
0 | 1394 |
|
5647
9a96d72c23be
(svn r8106) -Feature/Fix: Add the ability to load savegames when you don't have the exact GRF files in your list. GRF files that are found based on GRFID (but not on matching md5sum) are used instead of disabling them. This does not affect MP games, there you still need an exact match.
Darkvater
parents:
5636
diff
changeset
|
1395 |
/* Check if all NewGRFs are present, we are very strict in MP mode */ |
6229
695400602ab0
(svn r9031) -Codechange: Introduce grfconfig->status, and use it for states that are
maedhros
parents:
6196
diff
changeset
|
1396 |
GRFListCompatibility gcf_res = IsGoodGRFConfigList(); |
7036
f1e26f21aa08
(svn r10300) -Fix [FS#917]: give a better explanation why the loading of a savegame failed and do not crash on loading savegames that were altered by patches or branches.
rubidium
parents:
7018
diff
changeset
|
1397 |
if (_networking && gcf_res != GLC_ALL_GOOD) { |
f1e26f21aa08
(svn r10300) -Fix [FS#917]: give a better explanation why the loading of a savegame failed and do not crash on loading savegames that were altered by patches or branches.
rubidium
parents:
7018
diff
changeset
|
1398 |
SetSaveLoadError(STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH); |
f1e26f21aa08
(svn r10300) -Fix [FS#917]: give a better explanation why the loading of a savegame failed and do not crash on loading savegames that were altered by patches or branches.
rubidium
parents:
7018
diff
changeset
|
1399 |
return false; |
f1e26f21aa08
(svn r10300) -Fix [FS#917]: give a better explanation why the loading of a savegame failed and do not crash on loading savegames that were altered by patches or branches.
rubidium
parents:
7018
diff
changeset
|
1400 |
} |
5647
9a96d72c23be
(svn r8106) -Feature/Fix: Add the ability to load savegames when you don't have the exact GRF files in your list. GRF files that are found based on GRFID (but not on matching md5sum) are used instead of disabling them. This does not affect MP games, there you still need an exact match.
Darkvater
parents:
5636
diff
changeset
|
1401 |
|
9a96d72c23be
(svn r8106) -Feature/Fix: Add the ability to load savegames when you don't have the exact GRF files in your list. GRF files that are found based on GRFID (but not on matching md5sum) are used instead of disabling them. This does not affect MP games, there you still need an exact match.
Darkvater
parents:
5636
diff
changeset
|
1402 |
switch (gcf_res) { |
6229
695400602ab0
(svn r9031) -Codechange: Introduce grfconfig->status, and use it for states that are
maedhros
parents:
6196
diff
changeset
|
1403 |
case GLC_COMPATIBLE: _switch_mode_errorstr = STR_NEWGRF_COMPATIBLE_LOAD_WARNING; break; |
8670
4f8e4590be7f
(svn r12335) -Codechange: Don't stuff signed values into a unsigned variable when the variable can just be unsigned...
peter1138
parents:
8619
diff
changeset
|
1404 |
case GLC_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; _pause_game = -1; break; |
5652 | 1405 |
default: break; |
5647
9a96d72c23be
(svn r8106) -Feature/Fix: Add the ability to load savegames when you don't have the exact GRF files in your list. GRF files that are found based on GRFID (but not on matching md5sum) are used instead of disabling them. This does not affect MP games, there you still need an exact match.
Darkvater
parents:
5636
diff
changeset
|
1406 |
} |
5228
26dc9acf7d94
(svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames...
peter1138
parents:
5197
diff
changeset
|
1407 |
|
5340
8e534cd781cc
(svn r7506) -Codechange: [NewGRF] Add action 7/9/D variable 0x81 (current year)
glx
parents:
5314
diff
changeset
|
1408 |
/* Update current year |
8e534cd781cc
(svn r7506) -Codechange: [NewGRF] Add action 7/9/D variable 0x81 (current year)
glx
parents:
5314
diff
changeset
|
1409 |
* must be done before loading sprites as some newgrfs check it */ |
8e534cd781cc
(svn r7506) -Codechange: [NewGRF] Add action 7/9/D variable 0x81 (current year)
glx
parents:
5314
diff
changeset
|
1410 |
SetDate(_date); |
8e534cd781cc
(svn r7506) -Codechange: [NewGRF] Add action 7/9/D variable 0x81 (current year)
glx
parents:
5314
diff
changeset
|
1411 |
|
9070
dd0121143eba
(svn r12924) -Feature: Introducing the so called 'engine pool' which primarily removes the fixed engine type limits and also happens to allow (with the patch option 'dynamic_engines') multiple NewGRF vehicle sets to coexist.
peter1138
parents:
9069
diff
changeset
|
1412 |
/* Force dynamic engines off when loading older savegames */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
1413 |
if (CheckSavegameVersion(95)) _settings_game.vehicle.dynamic_engines = 0; |
9070
dd0121143eba
(svn r12924) -Feature: Introducing the so called 'engine pool' which primarily removes the fixed engine type limits and also happens to allow (with the patch option 'dynamic_engines') multiple NewGRF vehicle sets to coexist.
peter1138
parents:
9069
diff
changeset
|
1414 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1415 |
/* Load the sprites */ |
0 | 1416 |
GfxLoadSprites(); |
5155
a479ef9c16a5
(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
|
1417 |
LoadStringWidthTable(); |
0 | 1418 |
|
9070
dd0121143eba
(svn r12924) -Feature: Introducing the so called 'engine pool' which primarily removes the fixed engine type limits and also happens to allow (with the patch option 'dynamic_engines') multiple NewGRF vehicle sets to coexist.
peter1138
parents:
9069
diff
changeset
|
1419 |
/* Copy temporary data to Engine pool */ |
dd0121143eba
(svn r12924) -Feature: Introducing the so called 'engine pool' which primarily removes the fixed engine type limits and also happens to allow (with the patch option 'dynamic_engines') multiple NewGRF vehicle sets to coexist.
peter1138
parents:
9069
diff
changeset
|
1420 |
CopyTempEngineData(); |
dd0121143eba
(svn r12924) -Feature: Introducing the so called 'engine pool' which primarily removes the fixed engine type limits and also happens to allow (with the patch option 'dynamic_engines') multiple NewGRF vehicle sets to coexist.
peter1138
parents:
9069
diff
changeset
|
1421 |
|
2814
872583ce2ae7
(svn r3362) Fix issue with loading old (TTD) savegames:
peter1138
parents:
2808
diff
changeset
|
1422 |
/* Connect front and rear engines of multiheaded trains and converts |
872583ce2ae7
(svn r3362) Fix issue with loading old (TTD) savegames:
peter1138
parents:
2808
diff
changeset
|
1423 |
* subtype to the new format */ |
872583ce2ae7
(svn r3362) Fix issue with loading old (TTD) savegames:
peter1138
parents:
2808
diff
changeset
|
1424 |
if (CheckSavegameVersionOldStyle(17, 1)) ConvertOldMultiheadToNew(); |
872583ce2ae7
(svn r3362) Fix issue with loading old (TTD) savegames:
peter1138
parents:
2808
diff
changeset
|
1425 |
|
2928
1a352063cdde
(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
|
1426 |
/* Connect front and rear engines of multiheaded trains */ |
1a352063cdde
(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
|
1427 |
ConnectMultiheadedTrains(); |
2855
56c39efde08a
(svn r3403) -Codechange: [multiheaded engines] the references between the front and rear engines are no longer saved
bjarni
parents:
2848
diff
changeset
|
1428 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1429 |
/* reinit the landscape variables (landscape might have changed) */ |
0 | 1430 |
InitializeLandscapeVariables(true); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
185
diff
changeset
|
1431 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1432 |
/* Update all vehicles */ |
8172
bcad4f33bd3d
(svn r11735) -Fix [FS#1574]: Don't reset loading indicator IDs when only reloading NewGRFs.
peter1138
parents:
8157
diff
changeset
|
1433 |
AfterLoadVehicles(true); |
1542
62a03537ad0b
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1501
diff
changeset
|
1434 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1435 |
/* Update all waypoints */ |
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1436 |
if (CheckSavegameVersion(12)) FixOldWaypoints(); |
1542
62a03537ad0b
(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h
truelight
parents:
1501
diff
changeset
|
1437 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1438 |
/* in version 2.2 of the savegame, we have new airports */ |
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1439 |
if (CheckSavegameVersionOldStyle(2, 2)) UpdateOldAircraft(); |
0 | 1440 |
|
1441 |
AfterLoadTown(); |
|
1442 |
||
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1443 |
/* make sure there is a town in the game */ |
10236
50afe9dd466e
(svn r14464) -Codechange: replace (uint)-1 with UINT_MAX (PhilSophus)
rubidium
parents:
10208
diff
changeset
|
1444 |
if (_game_mode == GM_NORMAL && !ClosestTownFromTile(0, UINT_MAX)) { |
7036
f1e26f21aa08
(svn r10300) -Fix [FS#917]: give a better explanation why the loading of a savegame failed and do not crash on loading savegames that were altered by patches or branches.
rubidium
parents:
7018
diff
changeset
|
1445 |
SetSaveLoadError(STR_NO_TOWN_IN_SCENARIO); |
0 | 1446 |
return false; |
1447 |
} |
|
1448 |
||
8513
3d3f8ed01a37
(svn r12088) -Fix: assert when loading savegame with wrong tiletype at south map borders
smatz
parents:
8495
diff
changeset
|
1449 |
/* The void tiles on the southern border used to belong to a wrong class (pre 4.3). |
3d3f8ed01a37
(svn r12088) -Fix: assert when loading savegame with wrong tiletype at south map borders
smatz
parents:
8495
diff
changeset
|
1450 |
* This problem appears in savegame version 21 too, see r3455. But after loading the |
3d3f8ed01a37
(svn r12088) -Fix: assert when loading savegame with wrong tiletype at south map borders
smatz
parents:
8495
diff
changeset
|
1451 |
* savegame and saving again, the buggy map array could be converted to new savegame |
3d3f8ed01a37
(svn r12088) -Fix: assert when loading savegame with wrong tiletype at south map borders
smatz
parents:
8495
diff
changeset
|
1452 |
* version. It didn't show up before r12070. */ |
3d3f8ed01a37
(svn r12088) -Fix: assert when loading savegame with wrong tiletype at south map borders
smatz
parents:
8495
diff
changeset
|
1453 |
if (CheckSavegameVersion(87)) UpdateVoidTiles(); |
929
19096353d35c
(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
|
1454 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1455 |
/* If Load Scenario / New (Scenario) Game is used, |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1456 |
* a company does not exist yet. So create one here. |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1457 |
* 1 exeption: network-games. Those can have 0 companies |
6574
d286beed97ae
(svn r9785) -Fix (r942, FS#765): only non dedicated servers can't have 0 players
glx
parents:
6560
diff
changeset
|
1458 |
* But this exeption is not true for non dedicated network_servers! */ |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1459 |
if (!IsValidCompanyID(COMPANY_FIRST) && (!_networking || (_networking && _network_server && !_network_dedicated))) |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1460 |
DoStartupNewCompany(false); |
0 | 1461 |
|
7272
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1462 |
if (CheckSavegameVersion(72)) { |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1463 |
/* Locks/shiplifts in very old savegames had OWNER_WATER as owner */ |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1464 |
for (TileIndex t = 0; t < MapSize(); t++) { |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1465 |
switch (GetTileType(t)) { |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1466 |
default: break; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1467 |
|
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1468 |
case MP_WATER: |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1469 |
if (GetWaterTileType(t) == WATER_TILE_LOCK && GetTileOwner(t) == OWNER_WATER) SetTileOwner(t, OWNER_NONE); |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1470 |
break; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1471 |
|
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1472 |
case MP_STATION: { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
1473 |
if (HasBit(_m[t].m6, 3)) SetBit(_m[t].m6, 2); |
7272
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1474 |
StationGfx gfx = GetStationGfx(t); |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1475 |
StationType st; |
7954
57b51c69c072
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents:
7942
diff
changeset
|
1476 |
if ( IsInsideMM(gfx, 0, 8)) { // Railway station |
7272
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1477 |
st = STATION_RAIL; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1478 |
SetStationGfx(t, gfx - 0); |
7954
57b51c69c072
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents:
7942
diff
changeset
|
1479 |
} else if (IsInsideMM(gfx, 8, 67)) { // Airport |
7272
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1480 |
st = STATION_AIRPORT; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1481 |
SetStationGfx(t, gfx - 8); |
7954
57b51c69c072
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents:
7942
diff
changeset
|
1482 |
} else if (IsInsideMM(gfx, 67, 71)) { // Truck |
7272
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1483 |
st = STATION_TRUCK; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1484 |
SetStationGfx(t, gfx - 67); |
7954
57b51c69c072
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents:
7942
diff
changeset
|
1485 |
} else if (IsInsideMM(gfx, 71, 75)) { // Bus |
7272
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1486 |
st = STATION_BUS; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1487 |
SetStationGfx(t, gfx - 71); |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1488 |
} else if (gfx == 75) { // Oil rig |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1489 |
st = STATION_OILRIG; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1490 |
SetStationGfx(t, gfx - 75); |
7954
57b51c69c072
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents:
7942
diff
changeset
|
1491 |
} else if (IsInsideMM(gfx, 76, 82)) { // Dock |
7272
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1492 |
st = STATION_DOCK; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1493 |
SetStationGfx(t, gfx - 76); |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1494 |
} else if (gfx == 82) { // Buoy |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1495 |
st = STATION_BUOY; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1496 |
SetStationGfx(t, gfx - 82); |
7954
57b51c69c072
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents:
7942
diff
changeset
|
1497 |
} else if (IsInsideMM(gfx, 83, 168)) { // Extended airport |
7272
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1498 |
st = STATION_AIRPORT; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1499 |
SetStationGfx(t, gfx - 83 + 67 - 8); |
7954
57b51c69c072
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents:
7942
diff
changeset
|
1500 |
} else if (IsInsideMM(gfx, 168, 170)) { // Drive through truck |
7272
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1501 |
st = STATION_TRUCK; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1502 |
SetStationGfx(t, gfx - 168 + GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET); |
7954
57b51c69c072
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents:
7942
diff
changeset
|
1503 |
} else if (IsInsideMM(gfx, 170, 172)) { // Drive through bus |
7272
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1504 |
st = STATION_BUS; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1505 |
SetStationGfx(t, gfx - 170 + GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET); |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1506 |
} else { |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1507 |
return false; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1508 |
} |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1509 |
SB(_m[t].m6, 3, 3, st); |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1510 |
} break; |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1511 |
} |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1512 |
} |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1513 |
} |
d47fc9e22d1c
(svn r10601) -Codechange: store (and use) the type of stations instead of hardcoding station types by graphics IDs.
rubidium
parents:
7270
diff
changeset
|
1514 |
|
5880 | 1515 |
for (TileIndex t = 0; t < map_size; t++) { |
1516 |
switch (GetTileType(t)) { |
|
6093 | 1517 |
case MP_STATION: { |
1518 |
Station *st = GetStationByTile(t); |
|
1519 |
||
10262
7b6cd91d5596
(svn r14493) -Fix[FS#planetmaker]: Do not assign a station spread to buoys on loading games.
frosch
parents:
10236
diff
changeset
|
1520 |
/* Set up station spread; buoys do not have one */ |
7b6cd91d5596
(svn r14493) -Fix[FS#planetmaker]: Do not assign a station spread to buoys on loading games.
frosch
parents:
10236
diff
changeset
|
1521 |
if (!IsBuoy(t)) st->rect.BeforeAddTile(t, StationRect::ADD_FORCE); |
6093 | 1522 |
|
5880 | 1523 |
switch (GetStationType(t)) { |
1524 |
case STATION_TRUCK: |
|
1525 |
case STATION_BUS: |
|
1526 |
if (CheckSavegameVersion(6)) { |
|
6093 | 1527 |
/* From this version on there can be multiple road stops of the |
1528 |
* same type per station. Convert the existing stops to the new |
|
1529 |
* internal data structure. */ |
|
5880 | 1530 |
RoadStop *rs = new RoadStop(t); |
1531 |
if (rs == NULL) error("Too many road stops in savegame"); |
|
5879 | 1532 |
|
5880 | 1533 |
RoadStop **head = |
1534 |
IsTruckStop(t) ? &st->truck_stops : &st->bus_stops; |
|
1535 |
*head = rs; |
|
1536 |
} |
|
1537 |
break; |
|
1538 |
||
5884 | 1539 |
case STATION_OILRIG: { |
1540 |
/* Very old savegames sometimes have phantom oil rigs, i.e. |
|
1541 |
* an oil rig which got shut down, but not completly removed from |
|
1542 |
* the map |
|
1543 |
*/ |
|
7740
b87fe6440e5a
(svn r11277) -Fix (r8498): the check for ghost station (on water industries) always removed station for non-oilrig
glx
parents:
7739
diff
changeset
|
1544 |
TileIndex t1 = TILE_ADDXY(t, 0, 1); |
5886 | 1545 |
if (IsTileType(t1, MP_INDUSTRY) && |
7740
b87fe6440e5a
(svn r11277) -Fix (r8498): the check for ghost station (on water industries) always removed station for non-oilrig
glx
parents:
7739
diff
changeset
|
1546 |
GetIndustryGfx(t1) == GFX_OILRIG_1) { |
5886 | 1547 |
/* The internal encoding of oil rigs was changed twice. |
1548 |
* It was 3 (till 2.2) and later 5 (till 5.1). |
|
1549 |
* Setting it unconditionally does not hurt. |
|
1550 |
*/ |
|
1551 |
GetStationByTile(t)->airport_type = AT_OILRIG; |
|
1552 |
} else { |
|
5884 | 1553 |
DeleteOilRig(t); |
1554 |
} |
|
1555 |
break; |
|
1556 |
} |
|
1557 |
||
5880 | 1558 |
default: break; |
1559 |
} |
|
1560 |
break; |
|
6093 | 1561 |
} |
5880 | 1562 |
|
1563 |
default: break; |
|
5879 | 1564 |
} |
1565 |
} |
|
1566 |
||
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1567 |
/* In version 6.1 we put the town index in the map-array. To do this, we need |
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1568 |
* to use m2 (16bit big), so we need to clean m2, and that is where this is |
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1569 |
* all about ;) */ |
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1570 |
if (CheckSavegameVersionOldStyle(6, 1)) { |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1571 |
for (TileIndex t = 0; t < map_size; t++) { |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1572 |
switch (GetTileType(t)) { |
3983
0f815283e04b
(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
|
1573 |
case MP_HOUSE: |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1574 |
_m[t].m4 = _m[t].m2; |
10236
50afe9dd466e
(svn r14464) -Codechange: replace (uint)-1 with UINT_MAX (PhilSophus)
rubidium
parents:
10208
diff
changeset
|
1575 |
SetTownIndex(t, CalcClosestTownFromTile(t, UINT_MAX)->index); |
3983
0f815283e04b
(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
|
1576 |
break; |
0f815283e04b
(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
|
1577 |
|
7370
41adc721b1fa
(svn r10733) -Codechange: change MP_STREET into MP_ROAD as we use the word "road" everywhere except in the tile type.
rubidium
parents:
7272
diff
changeset
|
1578 |
case MP_ROAD: |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1579 |
_m[t].m4 |= (_m[t].m2 << 4); |
10167
b4bef78a1e24
(svn r14359) -Fix [FS#2311]: the ownership of roadtiles was not properly set for very old savegames (including TTD's) making it impossible to remove some pieces of road.
rubidium
parents:
10158
diff
changeset
|
1580 |
if ((GB(_m[t].m5, 4, 2) == ROAD_TILE_CROSSING ? (Owner)_m[t].m3 : GetTileOwner(t)) == OWNER_TOWN) { |
10236
50afe9dd466e
(svn r14464) -Codechange: replace (uint)-1 with UINT_MAX (PhilSophus)
rubidium
parents:
10208
diff
changeset
|
1581 |
SetTownIndex(t, CalcClosestTownFromTile(t, UINT_MAX)->index); |
3983
0f815283e04b
(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
|
1582 |
} else { |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1583 |
SetTownIndex(t, 0); |
3983
0f815283e04b
(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
|
1584 |
} |
0f815283e04b
(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
|
1585 |
break; |
0f815283e04b
(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
|
1586 |
|
0f815283e04b
(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
|
1587 |
default: break; |
1264
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1260
diff
changeset
|
1588 |
} |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1589 |
} |
1264
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1260
diff
changeset
|
1590 |
} |
acebb2b01e32
(svn r1768) -Codechange: Store town index in _map2 of town tiles
celestar
parents:
1260
diff
changeset
|
1591 |
|
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1592 |
/* From version 9.0, we update the max passengers of a town (was sometimes negative |
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1593 |
* before that. */ |
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1594 |
if (CheckSavegameVersion(9)) { |
1377
7ab329d1fc28
(svn r1881) -Fix: [ 1119308 ] Max passengers / mail variables are now 32 bit
celestar
parents:
1349
diff
changeset
|
1595 |
Town *t; |
2639 | 1596 |
FOR_ALL_TOWNS(t) UpdateTownMaxPass(t); |
1377
7ab329d1fc28
(svn r1881) -Fix: [ 1119308 ] Max passengers / mail variables are now 32 bit
celestar
parents:
1349
diff
changeset
|
1597 |
} |
7ab329d1fc28
(svn r1881) -Fix: [ 1119308 ] Max passengers / mail variables are now 32 bit
celestar
parents:
1349
diff
changeset
|
1598 |
|
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1599 |
/* From version 16.0, we included autorenew on engines, which are now saved, but |
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1600 |
* of course, we do need to initialize them for older savegames. */ |
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1601 |
if (CheckSavegameVersion(16)) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1602 |
FOR_ALL_COMPANIES(c) { |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1603 |
c->engine_renew_list = NULL; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1604 |
c->engine_renew = false; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1605 |
c->engine_renew_months = -6; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1606 |
c->engine_renew_money = 100000; |
2293
b48192aec903
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
1607 |
} |
5376
204acb84473f
(svn r7561) -Fix (FS#431): core and (patches) GUI were not in-sync with respect to autorenew settings. This is only a temporary fix, as the definite fix needs to move the autorenew settings to a per-company settings window.
rubidium
parents:
5352
diff
changeset
|
1608 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1609 |
/* When loading a game, _local_company is not yet set to the correct value. |
5376
204acb84473f
(svn r7561) -Fix (FS#431): core and (patches) GUI were not in-sync with respect to autorenew settings. This is only a temporary fix, as the definite fix needs to move the autorenew settings to a per-company settings window.
rubidium
parents:
5352
diff
changeset
|
1610 |
* However, in a dedicated server we are a spectator, so nothing needs to |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1611 |
* happen. In case we are not a dedicated server, the local company always |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1612 |
* becomes company 0, unless we are in the scenario editor where all the |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1613 |
* companies are 'invalid'. |
5376
204acb84473f
(svn r7561) -Fix (FS#431): core and (patches) GUI were not in-sync with respect to autorenew settings. This is only a temporary fix, as the definite fix needs to move the autorenew settings to a per-company settings window.
rubidium
parents:
5352
diff
changeset
|
1614 |
*/ |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1615 |
if (!_network_dedicated && IsValidCompanyID(COMPANY_FIRST)) { |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1616 |
c = GetCompany(COMPANY_FIRST); |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1617 |
c->engine_renew = _settings_client.gui.autorenew; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1618 |
c->engine_renew_months = _settings_client.gui.autorenew_months; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1619 |
c->engine_renew_money = _settings_client.gui.autorenew_money; |
2322
32c18dd9a9f1
(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
|
1620 |
} |
2293
b48192aec903
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
1621 |
} |
b48192aec903
(svn r2817) -Codechange: [autoreplace]: moved autoreplace and autorenew to serverside
bjarni
parents:
2290
diff
changeset
|
1622 |
|
6661
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1623 |
if (CheckSavegameVersion(48)) { |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1624 |
for (TileIndex t = 0; t < map_size; t++) { |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1625 |
switch (GetTileType(t)) { |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1626 |
case MP_RAILWAY: |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1627 |
if (IsPlainRailTile(t)) { |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1628 |
/* Swap ground type and signal type for plain rail tiles, so the |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1629 |
* ground type uses the same bits as for depots and waypoints. */ |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1630 |
uint tmp = GB(_m[t].m4, 0, 4); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1631 |
SB(_m[t].m4, 0, 4, GB(_m[t].m2, 0, 4)); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1632 |
SB(_m[t].m2, 0, 4, tmp); |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7922
diff
changeset
|
1633 |
} else if (HasBit(_m[t].m5, 2)) { |
6661
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1634 |
/* Split waypoint and depot rail type and remove the subtype. */ |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1635 |
ClrBit(_m[t].m5, 2); |
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1636 |
ClrBit(_m[t].m5, 6); |
6661
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1637 |
} |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1638 |
break; |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1639 |
|
7370
41adc721b1fa
(svn r10733) -Codechange: change MP_STREET into MP_ROAD as we use the word "road" everywhere except in the tile type.
rubidium
parents:
7272
diff
changeset
|
1640 |
case MP_ROAD: |
6661
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1641 |
/* Swap m3 and m4, so the track type for rail crossings is the |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1642 |
* same as for normal rail. */ |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1643 |
Swap(_m[t].m3, _m[t].m4); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1644 |
break; |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1645 |
|
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1646 |
default: break; |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1647 |
} |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1648 |
} |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1649 |
} |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1650 |
|
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1651 |
if (CheckSavegameVersion(61)) { |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1652 |
/* Added the RoadType */ |
6738
522ddf421dae
(svn r9971) -Fix (r9892, r9958): loading of post-'bridges over "everything"' messed with the railtype of bridges.
rubidium
parents:
6730
diff
changeset
|
1653 |
bool old_bridge = CheckSavegameVersion(42); |
6661
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1654 |
for (TileIndex t = 0; t < map_size; t++) { |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1655 |
switch(GetTileType(t)) { |
7370
41adc721b1fa
(svn r10733) -Codechange: change MP_STREET into MP_ROAD as we use the word "road" everywhere except in the tile type.
rubidium
parents:
7272
diff
changeset
|
1656 |
case MP_ROAD: |
6661
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1657 |
SB(_m[t].m5, 6, 2, GB(_m[t].m5, 4, 2)); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1658 |
switch (GetRoadTileType(t)) { |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1659 |
default: NOT_REACHED(); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1660 |
case ROAD_TILE_NORMAL: |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1661 |
SB(_m[t].m4, 0, 4, GB(_m[t].m5, 0, 4)); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1662 |
SB(_m[t].m4, 4, 4, 0); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1663 |
SB(_m[t].m6, 2, 4, 0); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1664 |
break; |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1665 |
case ROAD_TILE_CROSSING: |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1666 |
SB(_m[t].m4, 5, 2, GB(_m[t].m5, 2, 2)); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1667 |
break; |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1668 |
case ROAD_TILE_DEPOT: break; |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1669 |
} |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1670 |
SetRoadTypes(t, ROADTYPES_ROAD); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1671 |
break; |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1672 |
|
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1673 |
case MP_STATION: |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1674 |
if (IsRoadStop(t)) SetRoadTypes(t, ROADTYPES_ROAD); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1675 |
break; |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1676 |
|
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1677 |
case MP_TUNNELBRIDGE: |
6738
522ddf421dae
(svn r9971) -Fix (r9892, r9958): loading of post-'bridges over "everything"' messed with the railtype of bridges.
rubidium
parents:
6730
diff
changeset
|
1678 |
/* Middle part of "old" bridges */ |
8390
f88f515e6557
(svn r11960) -Cleanup: simplify some IsTunnel(Tile) / IsBridge(Tile) conditions
smatz
parents:
8368
diff
changeset
|
1679 |
if (old_bridge && IsBridge(t) && HasBit(_m[t].m5, 6)) break; |
f88f515e6557
(svn r11960) -Cleanup: simplify some IsTunnel(Tile) / IsBridge(Tile) conditions
smatz
parents:
8368
diff
changeset
|
1680 |
if (((old_bridge && IsBridge(t)) ? (TransportType)GB(_m[t].m5, 1, 2) : GetTunnelBridgeTransportType(t)) == TRANSPORT_ROAD) { |
6661
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1681 |
SetRoadTypes(t, ROADTYPES_ROAD); |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1682 |
} |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1683 |
break; |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1684 |
|
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1685 |
default: break; |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1686 |
} |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1687 |
} |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1688 |
} |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1689 |
|
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1690 |
if (CheckSavegameVersion(42)) { |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1691 |
Vehicle* v; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1692 |
|
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1693 |
for (TileIndex t = 0; t < map_size; t++) { |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1694 |
if (MayHaveBridgeAbove(t)) ClearBridgeMiddle(t); |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1695 |
if (IsBridgeTile(t)) { |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7922
diff
changeset
|
1696 |
if (HasBit(_m[t].m5, 6)) { // middle part |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1697 |
Axis axis = (Axis)GB(_m[t].m5, 0, 1); |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1698 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7922
diff
changeset
|
1699 |
if (HasBit(_m[t].m5, 5)) { // transport route under bridge? |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1700 |
if (GB(_m[t].m5, 3, 2) == TRANSPORT_RAIL) { |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1701 |
MakeRailNormal( |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1702 |
t, |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1703 |
GetTileOwner(t), |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1704 |
axis == AXIS_X ? TRACK_BIT_Y : TRACK_BIT_X, |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1705 |
GetRailType(t) |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1706 |
); |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1707 |
} else { |
10236
50afe9dd466e
(svn r14464) -Codechange: replace (uint)-1 with UINT_MAX (PhilSophus)
rubidium
parents:
10208
diff
changeset
|
1708 |
TownID town = IsTileOwner(t, OWNER_TOWN) ? ClosestTownFromTile(t, UINT_MAX)->index : 0; |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1709 |
|
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1710 |
MakeRoadNormal( |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1711 |
t, |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1712 |
axis == AXIS_X ? ROAD_Y : ROAD_X, |
6661
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1713 |
ROADTYPES_ROAD, |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1714 |
town, |
1716fce5ad29
(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.
rubidium
parents:
6654
diff
changeset
|
1715 |
GetTileOwner(t), OWNER_NONE, OWNER_NONE |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1716 |
); |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1717 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1718 |
} else { |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1719 |
if (GB(_m[t].m5, 3, 2) == 0) { |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1720 |
MakeClear(t, CLEAR_GRASS, 3); |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1721 |
} else { |
8404
1dcc835d3b16
(svn r11974) -Fix [FS#1684]: Shore and sea tiles under bridges were converted to canals in old savegames.
frosch
parents:
8390
diff
changeset
|
1722 |
if (GetTileSlope(t, NULL) != SLOPE_FLAT) { |
1dcc835d3b16
(svn r11974) -Fix [FS#1684]: Shore and sea tiles under bridges were converted to canals in old savegames.
frosch
parents:
8390
diff
changeset
|
1723 |
MakeShore(t); |
1dcc835d3b16
(svn r11974) -Fix [FS#1684]: Shore and sea tiles under bridges were converted to canals in old savegames.
frosch
parents:
8390
diff
changeset
|
1724 |
} else { |
1dcc835d3b16
(svn r11974) -Fix [FS#1684]: Shore and sea tiles under bridges were converted to canals in old savegames.
frosch
parents:
8390
diff
changeset
|
1725 |
if (GetTileOwner(t) == OWNER_WATER) { |
1dcc835d3b16
(svn r11974) -Fix [FS#1684]: Shore and sea tiles under bridges were converted to canals in old savegames.
frosch
parents:
8390
diff
changeset
|
1726 |
MakeWater(t); |
1dcc835d3b16
(svn r11974) -Fix [FS#1684]: Shore and sea tiles under bridges were converted to canals in old savegames.
frosch
parents:
8390
diff
changeset
|
1727 |
} else { |
1dcc835d3b16
(svn r11974) -Fix [FS#1684]: Shore and sea tiles under bridges were converted to canals in old savegames.
frosch
parents:
8390
diff
changeset
|
1728 |
MakeCanal(t, GetTileOwner(t), Random()); |
1dcc835d3b16
(svn r11974) -Fix [FS#1684]: Shore and sea tiles under bridges were converted to canals in old savegames.
frosch
parents:
8390
diff
changeset
|
1729 |
} |
1dcc835d3b16
(svn r11974) -Fix [FS#1684]: Shore and sea tiles under bridges were converted to canals in old savegames.
frosch
parents:
8390
diff
changeset
|
1730 |
} |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1731 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1732 |
} |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1733 |
SetBridgeMiddle(t, axis); |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1734 |
} else { // ramp |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1735 |
Axis axis = (Axis)GB(_m[t].m5, 0, 1); |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1736 |
uint north_south = GB(_m[t].m5, 5, 1); |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1737 |
DiagDirection dir = ReverseDiagDir(XYNSToDiagDir(axis, north_south)); |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1738 |
TransportType type = (TransportType)GB(_m[t].m5, 1, 2); |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1739 |
|
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1740 |
_m[t].m5 = 1 << 7 | type << 2 | dir; |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1741 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1742 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1743 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1744 |
|
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1745 |
FOR_ALL_VEHICLES(v) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6257
diff
changeset
|
1746 |
if (v->type != VEH_TRAIN && v->type != VEH_ROAD) continue; |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1747 |
if (IsBridgeTile(v->tile)) { |
8083
ad22eade501f
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
8082
diff
changeset
|
1748 |
DiagDirection dir = GetTunnelBridgeDirection(v->tile); |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1749 |
|
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1750 |
if (dir != DirToDiagDir(v->direction)) continue; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1751 |
switch (dir) { |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1752 |
default: NOT_REACHED(); |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1753 |
case DIAGDIR_NE: if ((v->x_pos & 0xF) != 0) continue; break; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1754 |
case DIAGDIR_SE: if ((v->y_pos & 0xF) != TILE_SIZE - 1) continue; break; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1755 |
case DIAGDIR_SW: if ((v->x_pos & 0xF) != TILE_SIZE - 1) continue; break; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1756 |
case DIAGDIR_NW: if ((v->y_pos & 0xF) != 0) continue; break; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1757 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1758 |
} else if (v->z_pos > GetSlopeZ(v->x_pos, v->y_pos)) { |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1759 |
v->tile = GetNorthernBridgeEnd(v->tile); |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1760 |
} else { |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1761 |
continue; |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1762 |
} |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6257
diff
changeset
|
1763 |
if (v->type == VEH_TRAIN) { |
5587
167d9a91ef02
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents:
5584
diff
changeset
|
1764 |
v->u.rail.track = TRACK_BIT_WORMHOLE; |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1765 |
} else { |
6000
181ad2c1ab14
(svn r8715) -Codechange/cleanup: replace magic numbers related to state of road vehicles with enums. Original patch by mart3p.
rubidium
parents:
5986
diff
changeset
|
1766 |
v->u.road.state = RVSB_WORMHOLE; |
5385
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1767 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1768 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1769 |
} |
3868f2e6db9b
(svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents:
5380
diff
changeset
|
1770 |
|
3355
e414a0b104a6
(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
|
1771 |
/* Elrails got added in rev 24 */ |
e414a0b104a6
(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
|
1772 |
if (CheckSavegameVersion(24)) { |
4171 | 1773 |
Vehicle *v; |
3656
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1774 |
RailType min_rail = RAILTYPE_ELECTRIC; |
3355
e414a0b104a6
(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
|
1775 |
|
e414a0b104a6
(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
|
1776 |
FOR_ALL_VEHICLES(v) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6257
diff
changeset
|
1777 |
if (v->type == VEH_TRAIN) { |
5823 | 1778 |
RailType rt = RailVehInfo(v->engine_type)->railtype; |
3355
e414a0b104a6
(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
|
1779 |
|
e414a0b104a6
(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
|
1780 |
v->u.rail.railtype = rt; |
3656
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1781 |
if (rt == RAILTYPE_ELECTRIC) min_rail = RAILTYPE_RAIL; |
3355
e414a0b104a6
(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
|
1782 |
} |
e414a0b104a6
(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
|
1783 |
} |
e414a0b104a6
(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
|
1784 |
|
e414a0b104a6
(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
|
1785 |
/* .. so we convert the entire map from normal to elrail (so maintain "fairness") */ |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1786 |
for (TileIndex t = 0; t < map_size; t++) { |
3355
e414a0b104a6
(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
|
1787 |
switch (GetTileType(t)) { |
e414a0b104a6
(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
|
1788 |
case MP_RAILWAY: |
3656
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1789 |
SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
3355
e414a0b104a6
(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
|
1790 |
break; |
e414a0b104a6
(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
|
1791 |
|
7370
41adc721b1fa
(svn r10733) -Codechange: change MP_STREET into MP_ROAD as we use the word "road" everywhere except in the tile type.
rubidium
parents:
7272
diff
changeset
|
1792 |
case MP_ROAD: |
3656
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1793 |
if (IsLevelCrossing(t)) { |
6172
e6d7a5b3d63f
(svn r8935) -Codechange: unification of track type between road and rail tiles, unification of ground type between normal rail tiles and depots/waypoints and removing the need for RailTileSubType.
rubidium
parents:
6093
diff
changeset
|
1794 |
SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
3656
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1795 |
} |
3355
e414a0b104a6
(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
|
1796 |
break; |
e414a0b104a6
(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
|
1797 |
|
e414a0b104a6
(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
|
1798 |
case MP_STATION: |
4077
d4d440dd8925
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
tron
parents:
4032
diff
changeset
|
1799 |
if (IsRailwayStation(t)) { |
3656
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1800 |
SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
4aecbb417d50
(svn r4571) Change the rail type update for electrified rails so it doesn't use bit magic
tron
parents:
3580
diff
changeset
|
1801 |
} |
3355
e414a0b104a6
(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
|
1802 |
break; |
e414a0b104a6
(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
|
1803 |
|
e414a0b104a6
(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
|
1804 |
case MP_TUNNELBRIDGE: |
8088
92fca5b09665
(svn r11649) -Codechange: some code can be simplified thanks to changes in r11642
smatz
parents:
8085
diff
changeset
|
1805 |
if (GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL) { |
92fca5b09665
(svn r11649) -Codechange: some code can be simplified thanks to changes in r11642
smatz
parents:
8085
diff
changeset
|
1806 |
SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
3355
e414a0b104a6
(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
|
1807 |
} |
e414a0b104a6
(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
|
1808 |
break; |
e414a0b104a6
(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
|
1809 |
|
e414a0b104a6
(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
|
1810 |
default: |
e414a0b104a6
(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
|
1811 |
break; |
e414a0b104a6
(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
|
1812 |
} |
e414a0b104a6
(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
|
1813 |
} |
e414a0b104a6
(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
|
1814 |
|
e414a0b104a6
(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
|
1815 |
FOR_ALL_VEHICLES(v) { |
9704
54123af5f9a5
(svn r13816) -Fix [FS#2150]: check for vehicle length changes outside a depot (callback 0x11) and give a warning about that
smatz
parents:
9667
diff
changeset
|
1816 |
if (v->type == VEH_TRAIN && (IsFrontEngine(v) || IsFreeWagon(v))) TrainConsistChanged(v, true); |
3355
e414a0b104a6
(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
|
1817 |
} |
e414a0b104a6
(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
|
1818 |
|
e414a0b104a6
(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
|
1819 |
} |
e414a0b104a6
(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
|
1820 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1821 |
/* In version 16.1 of the savegame a company can decide if trains, which get |
2805
29e2b43a1e20
(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
|
1822 |
* replaced, shall keep their old length. In all prior versions, just default |
29e2b43a1e20
(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
|
1823 |
* to false */ |
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1824 |
if (CheckSavegameVersionOldStyle(16, 1)) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1825 |
FOR_ALL_COMPANIES(c) c->renew_keep_length = false; |
2617
03120a0b1e39
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2572
diff
changeset
|
1826 |
} |
03120a0b1e39
(svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains
bjarni
parents:
2572
diff
changeset
|
1827 |
|
2670
f2d6a8424e3e
(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
|
1828 |
/* In version 17, ground type is moved from m2 to m4 for depots and |
f2d6a8424e3e
(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
|
1829 |
* waypoints to make way for storing the index in m2. The custom graphics |
f2d6a8424e3e
(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
|
1830 |
* id which was stored in m4 is now saved as a grf/id reference in the |
f2d6a8424e3e
(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
|
1831 |
* waypoint struct. */ |
2685
805a28b7c3b7
(svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version.
truelight
parents:
2684
diff
changeset
|
1832 |
if (CheckSavegameVersion(17)) { |
2670
f2d6a8424e3e
(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
|
1833 |
Waypoint *wp; |
f2d6a8424e3e
(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
|
1834 |
|
f2d6a8424e3e
(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
|
1835 |
FOR_ALL_WAYPOINTS(wp) { |
4346
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
1836 |
if (wp->deleted == 0) { |
3676
680dfa6336a1
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3656
diff
changeset
|
1837 |
const StationSpec *statspec = NULL; |
2670
f2d6a8424e3e
(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
|
1838 |
|
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7922
diff
changeset
|
1839 |
if (HasBit(_m[wp->xy].m3, 4)) |
3676
680dfa6336a1
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3656
diff
changeset
|
1840 |
statspec = GetCustomStationSpec(STAT_CLASS_WAYP, _m[wp->xy].m4 + 1); |
2670
f2d6a8424e3e
(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
|
1841 |
|
3676
680dfa6336a1
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3656
diff
changeset
|
1842 |
if (statspec != NULL) { |
2670
f2d6a8424e3e
(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
|
1843 |
wp->stat_id = _m[wp->xy].m4 + 1; |
6451
e576c71bfc09
(svn r9601) -Codechange: Store grf file reference in station spec, not just GRF ID
peter1138
parents:
6427
diff
changeset
|
1844 |
wp->grfid = statspec->grffile->grfid; |
3676
680dfa6336a1
(svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
belugas
parents:
3656
diff
changeset
|
1845 |
wp->localidx = statspec->localidx; |
2670
f2d6a8424e3e
(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
|
1846 |
} else { |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1847 |
/* No custom graphics set, so set to default. */ |
2670
f2d6a8424e3e
(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
|
1848 |
wp->stat_id = 0; |
f2d6a8424e3e
(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
|
1849 |
wp->grfid = 0; |
f2d6a8424e3e
(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
|
1850 |
wp->localidx = 0; |
f2d6a8424e3e
(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
|
1851 |
} |
f2d6a8424e3e
(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
|
1852 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1853 |
/* Move ground type bits from m2 to m4. */ |
2670
f2d6a8424e3e
(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
|
1854 |
_m[wp->xy].m4 = GB(_m[wp->xy].m2, 0, 4); |
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1855 |
/* Store waypoint index in the tile. */ |
2670
f2d6a8424e3e
(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
|
1856 |
_m[wp->xy].m2 = wp->index; |
f2d6a8424e3e
(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
|
1857 |
} |
f2d6a8424e3e
(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
|
1858 |
} |
f2d6a8424e3e
(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
|
1859 |
} else { |
f2d6a8424e3e
(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
|
1860 |
/* As of version 17, we recalculate the custom graphic ID of waypoints |
f2d6a8424e3e
(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
|
1861 |
* from the GRF ID / station index. */ |
5350
7564e1c8f5dd
(svn r7521) -Codechange: Rename UpdateAllWaypointCustomGraphics to AfterLoadWaypoints to be more conforming with other such functions.
Darkvater
parents:
5340
diff
changeset
|
1862 |
AfterLoadWaypoints(); |
2670
f2d6a8424e3e
(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
|
1863 |
} |
f2d6a8424e3e
(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
|
1864 |
|
2916
b687477adcba
(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
|
1865 |
/* From version 15, we moved a semaphore bit from bit 2 to bit 3 in m4, making |
b687477adcba
(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
|
1866 |
* room for PBS. Now in version 21 move it back :P. */ |
b687477adcba
(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
|
1867 |
if (CheckSavegameVersion(21) && !CheckSavegameVersion(15)) { |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1868 |
for (TileIndex t = 0; t < map_size; t++) { |
5707 | 1869 |
switch (GetTileType(t)) { |
1870 |
case MP_RAILWAY: |
|
1871 |
if (HasSignals(t)) { |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1872 |
/* convert PBS signals to combo-signals */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7922
diff
changeset
|
1873 |
if (HasBit(_m[t].m2, 2)) SetSignalType(t, TRACK_X, SIGTYPE_COMBO); |
2916
b687477adcba
(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
|
1874 |
|
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1875 |
/* move the signal variant back */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7922
diff
changeset
|
1876 |
SetSignalVariant(t, TRACK_X, HasBit(_m[t].m2, 3) ? SIG_SEMAPHORE : SIG_ELECTRIC); |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1877 |
ClrBit(_m[t].m2, 3); |
5707 | 1878 |
} |
1879 |
||
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1880 |
/* Clear PBS reservation on track */ |
8961
fb0848956387
(svn r12753) -Codechange: do not use IsDepotTypeTile() where simpler function can be used
smatz
parents:
8954
diff
changeset
|
1881 |
if (!IsRailDepotTile(t)) { |
5707 | 1882 |
SB(_m[t].m4, 4, 4, 0); |
1883 |
} else { |
|
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1884 |
ClrBit(_m[t].m3, 6); |
5707 | 1885 |
} |
1886 |
break; |
|
1887 |
||
7370
41adc721b1fa
(svn r10733) -Codechange: change MP_STREET into MP_ROAD as we use the word "road" everywhere except in the tile type.
rubidium
parents:
7272
diff
changeset
|
1888 |
case MP_ROAD: /* Clear PBS reservation on crossing */ |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1889 |
if (IsLevelCrossing(t)) ClrBit(_m[t].m5, 0); |
5707 | 1890 |
break; |
1891 |
||
6351
8d0b6cce8d6d
(svn r9390) -Documentation : correct Doxygen of comments and @file inclusion. This time, brought to you by the letter O
belugas
parents:
6333
diff
changeset
|
1892 |
case MP_STATION: /* Clear PBS reservation on station */ |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
1893 |
ClrBit(_m[t].m3, 6); |
5707 | 1894 |
break; |
2916
b687477adcba
(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
|
1895 |
|
5707 | 1896 |
default: break; |
1897 |
} |
|
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1898 |
} |
2916
b687477adcba
(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
|
1899 |
} |
b687477adcba
(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
|
1900 |
|
3431 | 1901 |
if (CheckSavegameVersion(25)) { |
1902 |
Vehicle *v; |
|
1903 |
FOR_ALL_VEHICLES(v) { |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6257
diff
changeset
|
1904 |
if (v->type == VEH_ROAD) { |
3431 | 1905 |
v->vehstatus &= ~0x40; |
1906 |
v->u.road.slot = NULL; |
|
1907 |
v->u.road.slot_age = 0; |
|
1908 |
} |
|
1909 |
} |
|
5677
92e3ee10d04c
(svn r8137) -Fix (FS#551, r4259, r4320): roadstop->num_vehicles was wrong for savegames with version 24 or lower and do not calculate roadstop->num_vehicles when reading the roadstops as the vehicles might not be loaded at that moment.
rubidium
parents:
5659
diff
changeset
|
1910 |
} else { |
92e3ee10d04c
(svn r8137) -Fix (FS#551, r4259, r4320): roadstop->num_vehicles was wrong for savegames with version 24 or lower and do not calculate roadstop->num_vehicles when reading the roadstops as the vehicles might not be loaded at that moment.
rubidium
parents:
5659
diff
changeset
|
1911 |
Vehicle *v; |
92e3ee10d04c
(svn r8137) -Fix (FS#551, r4259, r4320): roadstop->num_vehicles was wrong for savegames with version 24 or lower and do not calculate roadstop->num_vehicles when reading the roadstops as the vehicles might not be loaded at that moment.
rubidium
parents:
5659
diff
changeset
|
1912 |
FOR_ALL_VEHICLES(v) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6257
diff
changeset
|
1913 |
if (v->type == VEH_ROAD && v->u.road.slot != NULL) v->u.road.slot->num_vehicles++; |
5677
92e3ee10d04c
(svn r8137) -Fix (FS#551, r4259, r4320): roadstop->num_vehicles was wrong for savegames with version 24 or lower and do not calculate roadstop->num_vehicles when reading the roadstops as the vehicles might not be loaded at that moment.
rubidium
parents:
5659
diff
changeset
|
1914 |
} |
3431 | 1915 |
} |
1916 |
||
3580
14bf6e7715c8
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1917 |
if (CheckSavegameVersion(26)) { |
14bf6e7715c8
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1918 |
Station *st; |
14bf6e7715c8
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1919 |
FOR_ALL_STATIONS(st) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6257
diff
changeset
|
1920 |
st->last_vehicle_type = VEH_INVALID; |
3580
14bf6e7715c8
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1921 |
} |
14bf6e7715c8
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1922 |
} |
14bf6e7715c8
(svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted.
celestar
parents:
3558
diff
changeset
|
1923 |
|
3900
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3891
diff
changeset
|
1924 |
YapfNotifyTrackLayoutChange(INVALID_TILE, INVALID_TRACK); |
2c84ed52709d
(svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing.
KUDr
parents:
3891
diff
changeset
|
1925 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1926 |
if (CheckSavegameVersion(34)) FOR_ALL_COMPANIES(c) ResetCompanyLivery(c); |
4603
20c816f664de
(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
|
1927 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1928 |
FOR_ALL_COMPANIES(c) { |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1929 |
c->avail_railtypes = GetCompanyRailtypes(c->index); |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1930 |
c->avail_roadtypes = GetCompanyRoadtypes(c->index); |
6685
00490513d7b1
(svn r9917) -Codechange: prepare some more areas for more road types.
rubidium
parents:
6661
diff
changeset
|
1931 |
} |
2147
eb6ba42fd216
(svn r2657) -Codechange: The available railtypes per player are now a bitmask, so
celestar
parents:
2100
diff
changeset
|
1932 |
|
3765
a4ddbff73f9f
(svn r4757) - Newstations: add saveload support for custom station speclists
peter1138
parents:
3678
diff
changeset
|
1933 |
if (!CheckSavegameVersion(27)) AfterLoadStations(); |
a4ddbff73f9f
(svn r4757) - Newstations: add saveload support for custom station speclists
peter1138
parents:
3678
diff
changeset
|
1934 |
|
4326
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1935 |
/* Time starts at 0 instead of 1920. |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1936 |
* Account for this in older games by adding an offset */ |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1937 |
if (CheckSavegameVersion(31)) { |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1938 |
Station *st; |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1939 |
Waypoint *wp; |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1940 |
Engine *e; |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1941 |
Industry *i; |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1942 |
Vehicle *v; |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1943 |
|
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1944 |
_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
4383
f1e2d6c7527e
(svn r6136) -Fix: _cur_year wasn't converting when reading pre-31 savegames, causing nasty desyncs
truelight
parents:
4349
diff
changeset
|
1945 |
_cur_year += ORIGINAL_BASE_YEAR; |
4326
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1946 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1947 |
FOR_ALL_STATIONS(st) st->build_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1948 |
FOR_ALL_WAYPOINTS(wp) wp->build_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1949 |
FOR_ALL_ENGINES(e) e->intro_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1950 |
FOR_ALL_COMPANIES(c) c->inaugurated_year += ORIGINAL_BASE_YEAR; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
1951 |
FOR_ALL_INDUSTRIES(i) i->last_prod_year += ORIGINAL_BASE_YEAR; |
4326
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1952 |
|
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1953 |
FOR_ALL_VEHICLES(v) { |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1954 |
v->date_of_last_service += DAYS_TILL_ORIGINAL_BASE_YEAR; |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1955 |
v->build_year += ORIGINAL_BASE_YEAR; |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1956 |
} |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1957 |
} |
2e2c9d21ed96
(svn r5999) -Feature: change the original date format to a 32 bits format based at the year 0.
rubidium
parents:
4323
diff
changeset
|
1958 |
|
4328
1b3940c35724
(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
|
1959 |
/* From 32 on we save the industry who made the farmland. |
1b3940c35724
(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
|
1960 |
* To give this prettyness to old savegames, we remove all farmfields and |
1b3940c35724
(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
|
1961 |
* plant new ones. */ |
1b3940c35724
(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
|
1962 |
if (CheckSavegameVersion(32)) { |
1b3940c35724
(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
|
1963 |
Industry *i; |
1b3940c35724
(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
|
1964 |
|
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1965 |
for (TileIndex t = 0; t < map_size; t++) { |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1966 |
if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_FIELDS)) { |
8811
1a3302cf5d5c
(svn r12556) -Fix (r6001): remove fences with fields when loading old savegames, looks better
smatz
parents:
8809
diff
changeset
|
1967 |
/* remove fields */ |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1968 |
MakeClear(t, CLEAR_GRASS, 3); |
8811
1a3302cf5d5c
(svn r12556) -Fix (r6001): remove fences with fields when loading old savegames, looks better
smatz
parents:
8809
diff
changeset
|
1969 |
} else if (IsTileType(t, MP_CLEAR) || IsTileType(t, MP_TREES)) { |
1a3302cf5d5c
(svn r12556) -Fix (r6001): remove fences with fields when loading old savegames, looks better
smatz
parents:
8809
diff
changeset
|
1970 |
/* remove fences around fields */ |
1a3302cf5d5c
(svn r12556) -Fix (r6001): remove fences with fields when loading old savegames, looks better
smatz
parents:
8809
diff
changeset
|
1971 |
SetFenceSE(t, 0); |
1a3302cf5d5c
(svn r12556) -Fix (r6001): remove fences with fields when loading old savegames, looks better
smatz
parents:
8809
diff
changeset
|
1972 |
SetFenceSW(t, 0); |
4328
1b3940c35724
(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
|
1973 |
} |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
1974 |
} |
4328
1b3940c35724
(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
|
1975 |
|
1b3940c35724
(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
|
1976 |
FOR_ALL_INDUSTRIES(i) { |
1b3940c35724
(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
|
1977 |
uint j; |
1b3940c35724
(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
|
1978 |
|
6757
385cb1bf2ba9
(svn r9992) -Codechange: Remove some hardcoded references to Industry IDs.
belugas
parents:
6738
diff
changeset
|
1979 |
if (GetIndustrySpec(i->type)->behaviour & INDUSTRYBEH_PLANT_ON_BUILT) { |
4328
1b3940c35724
(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
|
1980 |
for (j = 0; j != 50; j++) PlantRandomFarmField(i); |
1b3940c35724
(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
|
1981 |
} |
1b3940c35724
(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
|
1982 |
} |
1b3940c35724
(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
|
1983 |
} |
1b3940c35724
(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
|
1984 |
|
4712
4335ad42e163
(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
|
1985 |
/* Setting no refit flags to all orders in savegames from before refit in orders were added */ |
4335ad42e163
(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
|
1986 |
if (CheckSavegameVersion(36)) { |
4335ad42e163
(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
|
1987 |
Order *order; |
4335ad42e163
(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
|
1988 |
Vehicle *v; |
4335ad42e163
(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
|
1989 |
|
4335ad42e163
(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
|
1990 |
FOR_ALL_ORDERS(order) { |
8838
068d63397dc3
(svn r12586) -Codechange: do not access an order's refit variables directly.
rubidium
parents:
8836
diff
changeset
|
1991 |
order->SetRefit(CT_NO_REFIT); |
4712
4335ad42e163
(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
|
1992 |
} |
4335ad42e163
(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
|
1993 |
|
4335ad42e163
(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
|
1994 |
FOR_ALL_VEHICLES(v) { |
8838
068d63397dc3
(svn r12586) -Codechange: do not access an order's refit variables directly.
rubidium
parents:
8836
diff
changeset
|
1995 |
v->current_order.SetRefit(CT_NO_REFIT); |
4712
4335ad42e163
(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
|
1996 |
} |
4335ad42e163
(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
|
1997 |
} |
4335ad42e163
(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
|
1998 |
|
9622
bf01317ddab2
(svn r13678) -Fix (r13677): electric trains from pre elrail savegames would get stopped on load.
rubidium
parents:
9621
diff
changeset
|
1999 |
/* from version 38 we have optional elrails, since we cannot know the |
bf01317ddab2
(svn r13678) -Fix (r13677): electric trains from pre elrail savegames would get stopped on load.
rubidium
parents:
9621
diff
changeset
|
2000 |
* preference of a user, let elrails enabled; it can be disabled manually */ |
bf01317ddab2
(svn r13678) -Fix (r13677): electric trains from pre elrail savegames would get stopped on load.
rubidium
parents:
9621
diff
changeset
|
2001 |
if (CheckSavegameVersion(38)) _settings_game.vehicle.disable_elrails = false; |
bf01317ddab2
(svn r13678) -Fix (r13677): electric trains from pre elrail savegames would get stopped on load.
rubidium
parents:
9621
diff
changeset
|
2002 |
/* do the same as when elrails were enabled/disabled manually just now */ |
bf01317ddab2
(svn r13678) -Fix (r13677): electric trains from pre elrail savegames would get stopped on load.
rubidium
parents:
9621
diff
changeset
|
2003 |
SettingsDisableElrail(_settings_game.vehicle.disable_elrails); |
bf01317ddab2
(svn r13678) -Fix (r13677): electric trains from pre elrail savegames would get stopped on load.
rubidium
parents:
9621
diff
changeset
|
2004 |
InitializeRailGUI(); |
bf01317ddab2
(svn r13678) -Fix (r13677): electric trains from pre elrail savegames would get stopped on load.
rubidium
parents:
9621
diff
changeset
|
2005 |
|
6333
496dba276c2d
(svn r9316) -Fix (r9315): Bump the savegame version for the newhouses merge.
maedhros
parents:
6332
diff
changeset
|
2006 |
/* From version 53, the map array was changed for house tiles to allow |
6332
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2007 |
* space for newhouses grf features. A new byte, m7, was also added. */ |
6333
496dba276c2d
(svn r9316) -Fix (r9315): Bump the savegame version for the newhouses merge.
maedhros
parents:
6332
diff
changeset
|
2008 |
if (CheckSavegameVersion(53)) { |
6332
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2009 |
for (TileIndex t = 0; t < map_size; t++) { |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2010 |
if (IsTileType(t, MP_HOUSE)) { |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2011 |
if (GB(_m[t].m3, 6, 2) != TOWN_HOUSE_COMPLETED) { |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2012 |
/* Move the construction stage from m3[7..6] to m5[5..4]. |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2013 |
* The construction counter does not have to move. */ |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2014 |
SB(_m[t].m5, 3, 2, GB(_m[t].m3, 6, 2)); |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2015 |
SB(_m[t].m3, 6, 2, 0); |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2016 |
|
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2017 |
/* The "house is completed" bit is now in m6[2]. */ |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2018 |
SetHouseCompleted(t, false); |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2019 |
} else { |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2020 |
/* The "lift has destination" bit has been moved from |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2021 |
* m5[7] to m7[0]. */ |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7922
diff
changeset
|
2022 |
SB(_me[t].m7, 0, 1, HasBit(_m[t].m5, 7)); |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
2023 |
ClrBit(_m[t].m5, 7); |
6332
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2024 |
|
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2025 |
/* The "lift is moving" bit has been removed, as it does |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2026 |
* the same job as the "lift has destination" bit. */ |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
2027 |
ClrBit(_m[t].m1, 7); |
6332
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2028 |
|
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2029 |
/* The position of the lift goes from m1[7..0] to m6[7..2], |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2030 |
* making m1 totally free, now. The lift position does not |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2031 |
* have to be a full byte since the maximum value is 36. */ |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2032 |
SetLiftPosition(t, GB(_m[t].m1, 0, 6 )); |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2033 |
|
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2034 |
_m[t].m1 = 0; |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2035 |
_m[t].m3 = 0; |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2036 |
SetHouseCompleted(t, true); |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2037 |
} |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2038 |
} |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2039 |
} |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2040 |
} |
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2041 |
|
8707
e57a09994e12
(svn r12381) -Fix [FS1835] [FS1535] (r11855): The number of houses wasn't computed right. A few other things regaring the updating had to be changed. Big thanks for support to frosch123 and SmatZ, to name just a few. (Inspired by a patch of bilbo)
skidd13
parents:
8681
diff
changeset
|
2042 |
/* Check and update house and town values */ |
e57a09994e12
(svn r12381) -Fix [FS1835] [FS1535] (r11855): The number of houses wasn't computed right. A few other things regaring the updating had to be changed. Big thanks for support to frosch123 and SmatZ, to name just a few. (Inspired by a patch of bilbo)
skidd13
parents:
8681
diff
changeset
|
2043 |
UpdateHousesAndTowns(); |
6332
f3f436dcd7d0
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
maedhros
parents:
6317
diff
changeset
|
2044 |
|
5436
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2045 |
if (CheckSavegameVersion(43)) { |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
2046 |
for (TileIndex t = 0; t < map_size; t++) { |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
2047 |
if (IsTileType(t, MP_INDUSTRY)) { |
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
2048 |
switch (GetIndustryGfx(t)) { |
5436
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2049 |
case GFX_POWERPLANT_SPARKS: |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
2050 |
SetIndustryAnimationState(t, GB(_m[t].m1, 2, 5)); |
5436
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2051 |
break; |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2052 |
|
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2053 |
case GFX_OILWELL_ANIMATED_1: |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2054 |
case GFX_OILWELL_ANIMATED_2: |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2055 |
case GFX_OILWELL_ANIMATED_3: |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
2056 |
SetIndustryAnimationState(t, GB(_m[t].m1, 0, 2)); |
5436
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2057 |
break; |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2058 |
|
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2059 |
case GFX_COAL_MINE_TOWER_ANIMATED: |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2060 |
case GFX_COPPER_MINE_TOWER_ANIMATED: |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2061 |
case GFX_GOLD_MINE_TOWER_ANIMATED: |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
2062 |
SetIndustryAnimationState(t, _m[t].m1); |
5436
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2063 |
break; |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2064 |
|
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2065 |
default: /* No animation states to change */ |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2066 |
break; |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2067 |
} |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2068 |
} |
5706
8521a5a71f1a
(svn r8183) When iterating over the map in AfterLoadGame() do it the same way for all loops
tron
parents:
5692
diff
changeset
|
2069 |
} |
5436
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2070 |
} |
b3d017be25b4
(svn r7642) -Codechange: unify all the different locations where the animation state is stored into a single location.
rubidium
parents:
5425
diff
changeset
|
2071 |
|
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5677
diff
changeset
|
2072 |
if (CheckSavegameVersion(44)) { |
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5677
diff
changeset
|
2073 |
Vehicle *v; |
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5677
diff
changeset
|
2074 |
/* If we remove a station while cargo from it is still enroute, payment calculation will assume |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2075 |
* 0, 0 to be the source of the cargo, resulting in very high payments usually. v->source_xy |
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5677
diff
changeset
|
2076 |
* stores the coordinates, preserving them even if the station is removed. However, if a game is loaded |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2077 |
* where this situation exists, the cargo-source information is lost. in this case, we set the source |
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5677
diff
changeset
|
2078 |
* to the current tile of the vehicle to prevent excessive profits |
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5677
diff
changeset
|
2079 |
*/ |
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5677
diff
changeset
|
2080 |
FOR_ALL_VEHICLES(v) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2081 |
const CargoList::List *packets = v->cargo.Packets(); |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2082 |
for (CargoList::List::const_iterator it = packets->begin(); it != packets->end(); it++) { |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2083 |
CargoPacket *cp = *it; |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2084 |
cp->source_xy = IsValidStationID(cp->source) ? GetStation(cp->source)->xy : v->tile; |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2085 |
cp->loaded_at_xy = cp->source_xy; |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2086 |
} |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2087 |
v->cargo.InvalidateCache(); |
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5677
diff
changeset
|
2088 |
} |
6304
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2089 |
|
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2090 |
/* Store position of the station where the goods come from, so there |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2091 |
* are no very high payments when stations get removed. However, if the |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2092 |
* station where the goods came from is already removed, the source |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2093 |
* information is lost. In that case we set it to the position of this |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2094 |
* station */ |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2095 |
Station *st; |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2096 |
FOR_ALL_STATIONS(st) { |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2097 |
for (CargoID c = 0; c < NUM_CARGO; c++) { |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2098 |
GoodsEntry *ge = &st->goods[c]; |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2099 |
|
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2100 |
const CargoList::List *packets = ge->cargo.Packets(); |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2101 |
for (CargoList::List::const_iterator it = packets->begin(); it != packets->end(); it++) { |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2102 |
CargoPacket *cp = *it; |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2103 |
cp->source_xy = IsValidStationID(cp->source) ? GetStation(cp->source)->xy : st->xy; |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2104 |
cp->loaded_at_xy = cp->source_xy; |
6304
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2105 |
} |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2106 |
} |
141a1149fdea
(svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios.
peter1138
parents:
6259
diff
changeset
|
2107 |
} |
5683
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5677
diff
changeset
|
2108 |
} |
b027e5d5b4cd
(svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing)
celestar
parents:
5677
diff
changeset
|
2109 |
|
5888
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2110 |
if (CheckSavegameVersion(45)) { |
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2111 |
Vehicle *v; |
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2112 |
/* Originally just the fact that some cargo had been paid for was |
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2113 |
* stored to stop people cheating and cashing in several times. This |
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2114 |
* wasn't enough though as it was cleared when the vehicle started |
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2115 |
* loading again, even if it didn't actually load anything, so now the |
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2116 |
* amount of cargo that has been paid for is stored. */ |
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2117 |
FOR_ALL_VEHICLES(v) { |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2118 |
const CargoList::List *packets = v->cargo.Packets(); |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2119 |
for (CargoList::List::const_iterator it = packets->begin(); it != packets->end(); it++) { |
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2120 |
CargoPacket *cp = *it; |
7928
63e18de69e50
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
skidd13
parents:
7922
diff
changeset
|
2121 |
cp->paid_for = HasBit(v->vehicle_flags, 2); |
5888
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2122 |
} |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
2123 |
ClrBit(v->vehicle_flags, 2); |
7010
6f0d9f03180d
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
rubidium
parents:
6937
diff
changeset
|
2124 |
v->cargo.InvalidateCache(); |
5888
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2125 |
} |
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2126 |
} |
6fb161a15a3c
(svn r8501) -Fix (r7377) [FS#539]: Keep track of how much cargo has been paid for, so that cargo cannot be paid for more than once.
maedhros
parents:
5886
diff
changeset
|
2127 |
|
5986
6364a078d30c
(svn r8689) -Fix [FS#613] (r8619): crash when an old savegame had buoys on the northern edge of the map.
rubidium
parents:
5977
diff
changeset
|
2128 |
/* Buoys do now store the owner of the previous water tile, which can never |
6364a078d30c
(svn r8689) -Fix [FS#613] (r8619): crash when an old savegame had buoys on the northern edge of the map.
rubidium
parents:
5977
diff
changeset
|
2129 |
* be OWNER_NONE. So replace OWNER_NONE with OWNER_WATER. */ |
6364a078d30c
(svn r8689) -Fix [FS#613] (r8619): crash when an old savegame had buoys on the northern edge of the map.
rubidium
parents:
5977
diff
changeset
|
2130 |
if (CheckSavegameVersion(46)) { |
6364a078d30c
(svn r8689) -Fix [FS#613] (r8619): crash when an old savegame had buoys on the northern edge of the map.
rubidium
parents:
5977
diff
changeset
|
2131 |
Station *st; |
6364a078d30c
(svn r8689) -Fix [FS#613] (r8619): crash when an old savegame had buoys on the northern edge of the map.
rubidium
parents:
5977
diff
changeset
|
2132 |
FOR_ALL_STATIONS(st) { |
7788
b4cda59c0e5c
(svn r11338) -Fix [FS#1359]: water tiles not at sealevel (i.e. canals) should not be owned by water as that signals normal water.
rubidium
parents:
7740
diff
changeset
|
2133 |
if (st->IsBuoy() && IsTileOwner(st->xy, OWNER_NONE) && TileHeight(st->xy) == 0) SetTileOwner(st->xy, OWNER_WATER); |
5986
6364a078d30c
(svn r8689) -Fix [FS#613] (r8619): crash when an old savegame had buoys on the northern edge of the map.
rubidium
parents:
5977
diff
changeset
|
2134 |
} |
6364a078d30c
(svn r8689) -Fix [FS#613] (r8619): crash when an old savegame had buoys on the northern edge of the map.
rubidium
parents:
5977
diff
changeset
|
2135 |
} |
6364a078d30c
(svn r8689) -Fix [FS#613] (r8619): crash when an old savegame had buoys on the northern edge of the map.
rubidium
parents:
5977
diff
changeset
|
2136 |
|
6193
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2137 |
if (CheckSavegameVersion(50)) { |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2138 |
Vehicle *v; |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2139 |
/* Aircraft units changed from 8 mph to 1 km/h */ |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2140 |
FOR_ALL_VEHICLES(v) { |
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6257
diff
changeset
|
2141 |
if (v->type == VEH_AIRCRAFT && v->subtype <= AIR_AIRCRAFT) { |
6193
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2142 |
const AircraftVehicleInfo *avi = AircraftVehInfo(v->engine_type); |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2143 |
v->cur_speed *= 129; |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2144 |
v->cur_speed /= 10; |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2145 |
v->max_speed = avi->max_speed; |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2146 |
v->acceleration = avi->acceleration; |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2147 |
} |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2148 |
} |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2149 |
} |
6f20de9e4f1b
(svn r8973) -Feature/Codechange: Changed the internal unit for aircraft velocities to from 8mph to 1km/h (peter1138), also give aircraft realsitic velocities (so that 1km/h is 1km/h independent of vehicle type) (peter1138). Introduce a flag to reduce aircraft speed in holding patterns to some realistic velocity. Use this flag for the city airport for the time being and make use of the different entry points for this airport type.
celestar
parents:
6190
diff
changeset
|
2150 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2151 |
if (CheckSavegameVersion(49)) FOR_ALL_COMPANIES(c) c->face = ConvertFromOldCompanyManagerFace(c->face); |
6190
01a2b579b668
(svn r8969) -Codechange: rework of the player face bits.
rubidium
parents:
6175
diff
changeset
|
2152 |
|
6257
5e5a864cacf6
(svn r9066) -Fix [FS#638]: store the owner of a statue, so when it gets removed, the town is notified of it
truelight
parents:
6247
diff
changeset
|
2153 |
if (CheckSavegameVersion(52)) { |
5e5a864cacf6
(svn r9066) -Fix [FS#638]: store the owner of a statue, so when it gets removed, the town is notified of it
truelight
parents:
6247
diff
changeset
|
2154 |
for (TileIndex t = 0; t < map_size; t++) { |
5e5a864cacf6
(svn r9066) -Fix [FS#638]: store the owner of a statue, so when it gets removed, the town is notified of it
truelight
parents:
6247
diff
changeset
|
2155 |
if (IsStatueTile(t)) { |
10236
50afe9dd466e
(svn r14464) -Codechange: replace (uint)-1 with UINT_MAX (PhilSophus)
rubidium
parents:
10208
diff
changeset
|
2156 |
_m[t].m2 = CalcClosestTownFromTile(t, UINT_MAX)->index; |
6257
5e5a864cacf6
(svn r9066) -Fix [FS#638]: store the owner of a statue, so when it gets removed, the town is notified of it
truelight
parents:
6247
diff
changeset
|
2157 |
} |
5e5a864cacf6
(svn r9066) -Fix [FS#638]: store the owner of a statue, so when it gets removed, the town is notified of it
truelight
parents:
6247
diff
changeset
|
2158 |
} |
5e5a864cacf6
(svn r9066) -Fix [FS#638]: store the owner of a statue, so when it gets removed, the town is notified of it
truelight
parents:
6247
diff
changeset
|
2159 |
} |
5e5a864cacf6
(svn r9066) -Fix [FS#638]: store the owner of a statue, so when it gets removed, the town is notified of it
truelight
parents:
6247
diff
changeset
|
2160 |
|
6486
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2161 |
/* A patch option containing the proportion of towns that grow twice as |
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2162 |
* fast was added in version 54. From version 56 this is now saved in the |
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2163 |
* town as cities can be built specifically in the scenario editor. */ |
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2164 |
if (CheckSavegameVersion(56)) { |
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2165 |
Town *t; |
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2166 |
|
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2167 |
FOR_ALL_TOWNS(t) { |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2168 |
if (_settings_game.economy.larger_towns != 0 && (t->index % _settings_game.economy.larger_towns) == 0) { |
6486
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2169 |
t->larger_town = true; |
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2170 |
} |
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2171 |
} |
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2172 |
} |
7d2ae0a167fb
(svn r9667) -Feature: Add the concept of cities. A (configurable) proportion of towns can
maedhros
parents:
6453
diff
changeset
|
2173 |
|
6500
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2174 |
if (CheckSavegameVersion(57)) { |
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2175 |
Vehicle *v; |
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2176 |
/* Added a FIFO queue of vehicles loading at stations */ |
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2177 |
FOR_ALL_VEHICLES(v) { |
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2178 |
if ((v->type != VEH_TRAIN || IsFrontEngine(v)) && // for all locs |
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2179 |
!(v->vehstatus & (VS_STOPPED | VS_CRASHED)) && // not stopped or crashed |
8836
f6f1ea3d7e93
(svn r12584) -Codechange: do not access the order type directly.
rubidium
parents:
8811
diff
changeset
|
2180 |
v->current_order.IsType(OT_LOADING)) { // loading |
6500
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2181 |
GetStation(v->last_station_visited)->loading_vehicles.push_back(v); |
6619
feb55b075339
(svn r9839) -Fix: vehicles in old savegames could leave the station because the changed loading algorithm thought it was already finished.
rubidium
parents:
6591
diff
changeset
|
2182 |
|
feb55b075339
(svn r9839) -Fix: vehicles in old savegames could leave the station because the changed loading algorithm thought it was already finished.
rubidium
parents:
6591
diff
changeset
|
2183 |
/* The loading finished flag is *only* set when actually completely |
feb55b075339
(svn r9839) -Fix: vehicles in old savegames could leave the station because the changed loading algorithm thought it was already finished.
rubidium
parents:
6591
diff
changeset
|
2184 |
* finished. Because the vehicle is loading, it is not finished. */ |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
2185 |
ClrBit(v->vehicle_flags, VF_LOADING_FINISHED); |
6500
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2186 |
} |
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2187 |
} |
7475
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2188 |
} else if (CheckSavegameVersion(59)) { |
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2189 |
/* For some reason non-loading vehicles could be in the station's loading vehicle list */ |
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2190 |
|
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2191 |
Station *st; |
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2192 |
FOR_ALL_STATIONS(st) { |
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2193 |
std::list<Vehicle *>::iterator iter; |
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2194 |
for (iter = st->loading_vehicles.begin(); iter != st->loading_vehicles.end();) { |
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2195 |
Vehicle *v = *iter; |
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2196 |
iter++; |
8836
f6f1ea3d7e93
(svn r12584) -Codechange: do not access the order type directly.
rubidium
parents:
8811
diff
changeset
|
2197 |
if (!v->current_order.IsType(OT_LOADING)) st->loading_vehicles.remove(v); |
7475
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2198 |
} |
cd87a7db15bf
(svn r10982) -Fix [FS#1162]: some old savegames could be in a state that the current game logic does not like; in the list of vehicles loading at a station when the vehicle is not actually at the station.
rubidium
parents:
7414
diff
changeset
|
2199 |
} |
6500
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2200 |
} |
f12678890222
(svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains.
rubidium
parents:
6491
diff
changeset
|
2201 |
|
6560
24106d85dcf5
(svn r9762) -Feature: Two new difficulty settings : Very low number of towns and very low number of industries
belugas
parents:
6500
diff
changeset
|
2202 |
if (CheckSavegameVersion(58)) { |
9950
2a0d0769c0e3
(svn r14105) -Fix: Some typos that are more grammatical errors, as it seems.
belugas
parents:
9941
diff
changeset
|
2203 |
/* patch difficulty number_industries other than zero get bumped to +1 |
6560
24106d85dcf5
(svn r9762) -Feature: Two new difficulty settings : Very low number of towns and very low number of industries
belugas
parents:
6500
diff
changeset
|
2204 |
* since a new option (very low at position1) has been added */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2205 |
if (_settings_game.difficulty.number_industries > 0) { |
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2206 |
_settings_game.difficulty.number_industries++; |
6560
24106d85dcf5
(svn r9762) -Feature: Two new difficulty settings : Very low number of towns and very low number of industries
belugas
parents:
6500
diff
changeset
|
2207 |
} |
24106d85dcf5
(svn r9762) -Feature: Two new difficulty settings : Very low number of towns and very low number of industries
belugas
parents:
6500
diff
changeset
|
2208 |
|
24106d85dcf5
(svn r9762) -Feature: Two new difficulty settings : Very low number of towns and very low number of industries
belugas
parents:
6500
diff
changeset
|
2209 |
/* Same goes for number of towns, although no test is needed, just an increment */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2210 |
_settings_game.difficulty.number_towns++; |
6560
24106d85dcf5
(svn r9762) -Feature: Two new difficulty settings : Very low number of towns and very low number of industries
belugas
parents:
6500
diff
changeset
|
2211 |
} |
24106d85dcf5
(svn r9762) -Feature: Two new difficulty settings : Very low number of towns and very low number of industries
belugas
parents:
6500
diff
changeset
|
2212 |
|
6770
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2213 |
if (CheckSavegameVersion(64)) { |
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2214 |
/* copy the signal type/variant and move signal states bits */ |
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2215 |
for (TileIndex t = 0; t < map_size; t++) { |
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2216 |
if (IsTileType(t, MP_RAILWAY) && HasSignals(t)) { |
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2217 |
SetSignalStates(t, GB(_m[t].m2, 4, 4)); |
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2218 |
SetSignalVariant(t, INVALID_TRACK, GetSignalVariant(t, TRACK_X)); |
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2219 |
SetSignalType(t, INVALID_TRACK, GetSignalType(t, TRACK_X)); |
7929
6c9b25842b0f
(svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style
skidd13
parents:
7928
diff
changeset
|
2220 |
ClrBit(_m[t].m2, 7); |
6770
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2221 |
} |
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2222 |
} |
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2223 |
} |
408585d467f9
(svn r10006) -Fix (FS#362): allow different signal types on one tile
glx
parents:
6757
diff
changeset
|
2224 |
|
7012
b7bdf660e8d7
(svn r10268) -Fix: some old savegames could have the wrong bits unset (follow up of r10147)
rubidium
parents:
7010
diff
changeset
|
2225 |
if (CheckSavegameVersion(69)) { |
b7bdf660e8d7
(svn r10268) -Fix: some old savegames could have the wrong bits unset (follow up of r10147)
rubidium
parents:
7010
diff
changeset
|
2226 |
/* In some old savegames a bit was cleared when it should not be cleared */ |
b7bdf660e8d7
(svn r10268) -Fix: some old savegames could have the wrong bits unset (follow up of r10147)
rubidium
parents:
7010
diff
changeset
|
2227 |
Vehicle *v; |
b7bdf660e8d7
(svn r10268) -Fix: some old savegames could have the wrong bits unset (follow up of r10147)
rubidium
parents:
7010
diff
changeset
|
2228 |
FOR_ALL_VEHICLES(v) { |
b7bdf660e8d7
(svn r10268) -Fix: some old savegames could have the wrong bits unset (follow up of r10147)
rubidium
parents:
7010
diff
changeset
|
2229 |
if (v->type == VEH_ROAD && (v->u.road.state == 250 || v->u.road.state == 251)) { |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
2230 |
SetBit(v->u.road.state, RVS_IS_STOPPING); |
7012
b7bdf660e8d7
(svn r10268) -Fix: some old savegames could have the wrong bits unset (follow up of r10147)
rubidium
parents:
7010
diff
changeset
|
2231 |
} |
b7bdf660e8d7
(svn r10268) -Fix: some old savegames could have the wrong bits unset (follow up of r10147)
rubidium
parents:
7010
diff
changeset
|
2232 |
} |
b7bdf660e8d7
(svn r10268) -Fix: some old savegames could have the wrong bits unset (follow up of r10147)
rubidium
parents:
7010
diff
changeset
|
2233 |
} |
b7bdf660e8d7
(svn r10268) -Fix: some old savegames could have the wrong bits unset (follow up of r10147)
rubidium
parents:
7010
diff
changeset
|
2234 |
|
7186
818eba1f20d5
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7170
diff
changeset
|
2235 |
if (CheckSavegameVersion(70)) { |
818eba1f20d5
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7170
diff
changeset
|
2236 |
/* Added variables to support newindustries */ |
818eba1f20d5
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7170
diff
changeset
|
2237 |
Industry *i; |
818eba1f20d5
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7170
diff
changeset
|
2238 |
FOR_ALL_INDUSTRIES(i) i->founder = OWNER_NONE; |
818eba1f20d5
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7170
diff
changeset
|
2239 |
} |
818eba1f20d5
(svn r10460) -Codechange: add some more variables needed for newindustries regarding to the creation of the industries.
rubidium
parents:
7170
diff
changeset
|
2240 |
|
7739
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2241 |
/* From version 82, old style canals (above sealevel (0), WATER owner) are no longer supported. |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2242 |
Replace the owner for those by OWNER_NONE. */ |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2243 |
if (CheckSavegameVersion(82)) { |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2244 |
for (TileIndex t = 0; t < map_size; t++) { |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2245 |
if (IsTileType(t, MP_WATER) && |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2246 |
GetWaterTileType(t) == WATER_TILE_CLEAR && |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2247 |
GetTileOwner(t) == OWNER_WATER && |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2248 |
TileHeight(t) != 0) { |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2249 |
SetTileOwner(t, OWNER_NONE); |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2250 |
} |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2251 |
} |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2252 |
} |
0b6f3da5c083
(svn r11276) -Codechange: be more consistent with naming of some accessors.
rubidium
parents:
7710
diff
changeset
|
2253 |
|
8029
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2254 |
/* |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2255 |
* Add the 'previous' owner to the ship depots so we can reset it with |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2256 |
* the correct values when it gets destroyed. This prevents that |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2257 |
* someone can remove canals owned by somebody else and it prevents |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2258 |
* making floods using the removal of ship depots. |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2259 |
*/ |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2260 |
if (CheckSavegameVersion(83)) { |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2261 |
for (TileIndex t = 0; t < map_size; t++) { |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2262 |
if (IsTileType(t, MP_WATER) && IsShipDepot(t)) { |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2263 |
_m[t].m4 = (TileHeight(t) == 0) ? OWNER_WATER : OWNER_NONE; |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2264 |
} |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2265 |
} |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2266 |
} |
6cc607fe1d3d
(svn r11589) -Fix [FS#1514]: when ship depots got destroyed they always returned to water, even when it should've been canals.
rubidium
parents:
8013
diff
changeset
|
2267 |
|
7515
67cd8c519fab
(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.
rubidium
parents:
7475
diff
changeset
|
2268 |
if (CheckSavegameVersion(74)) { |
67cd8c519fab
(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.
rubidium
parents:
7475
diff
changeset
|
2269 |
Station *st; |
67cd8c519fab
(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.
rubidium
parents:
7475
diff
changeset
|
2270 |
FOR_ALL_STATIONS(st) { |
67cd8c519fab
(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.
rubidium
parents:
7475
diff
changeset
|
2271 |
for (CargoID c = 0; c < NUM_CARGO; c++) { |
67cd8c519fab
(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.
rubidium
parents:
7475
diff
changeset
|
2272 |
st->goods[c].last_speed = 0; |
7931
b0a46cd92225
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
skidd13
parents:
7929
diff
changeset
|
2273 |
if (st->goods[c].cargo.Count() != 0) SetBit(st->goods[c].acceptance_pickup, GoodsEntry::PICKUP); |
7515
67cd8c519fab
(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.
rubidium
parents:
7475
diff
changeset
|
2274 |
} |
67cd8c519fab
(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.
rubidium
parents:
7475
diff
changeset
|
2275 |
} |
67cd8c519fab
(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.
rubidium
parents:
7475
diff
changeset
|
2276 |
} |
67cd8c519fab
(svn r11030) -Revert r11016, Fix [FS#1178]: the way to determine whether a station should get goods was not done properly.
rubidium
parents:
7475
diff
changeset
|
2277 |
|
7645
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2278 |
if (CheckSavegameVersion(78)) { |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2279 |
Industry *i; |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2280 |
uint j; |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2281 |
FOR_ALL_INDUSTRIES(i) { |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2282 |
const IndustrySpec *indsp = GetIndustrySpec(i->type); |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2283 |
for (j = 0; j < lengthof(i->produced_cargo); j++) { |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2284 |
i->produced_cargo[j] = indsp->produced_cargo[j]; |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2285 |
} |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2286 |
for (j = 0; j < lengthof(i->accepts_cargo); j++) { |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2287 |
i->accepts_cargo[j] = indsp->accepts_cargo[j]; |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2288 |
} |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2289 |
} |
efa25fcf7917
(svn r11176) -Revert (r9867): as it is needed for newgrf callbacks 14B and 14C
glx
parents:
7609
diff
changeset
|
2290 |
} |
6643
f81bee57bc09
(svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13.
rubidium
parents:
6629
diff
changeset
|
2291 |
|
7710
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2292 |
/* Before version 81, the density of grass was always stored as zero, and |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2293 |
* grassy trees were always drawn fully grassy. Furthermore, trees on rough |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2294 |
* land used to have zero density, now they have full density. Therefore, |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2295 |
* make all grassy/rough land trees have a density of 3. */ |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2296 |
if (CheckSavegameVersion(81)) { |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2297 |
for (TileIndex t = 0; t < map_size; t++) { |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2298 |
if (GetTileType(t) == MP_TREES) { |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2299 |
TreeGround groundType = GetTreeGround(t); |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2300 |
if (groundType != TREE_GROUND_SNOW_DESERT) SetTreeGroundDensity(t, groundType, 3); |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2301 |
} |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2302 |
} |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2303 |
} |
777524fbb1fb
(svn r11244) -Fix: trees can now be planted on bare land without making it grassy (Csaboka)
truelight
parents:
7645
diff
changeset
|
2304 |
|
8926
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2305 |
|
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2306 |
if (CheckSavegameVersion(93)) { |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2307 |
/* Rework of orders. */ |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2308 |
Order *order; |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2309 |
FOR_ALL_ORDERS(order) order->ConvertFromOldSavegame(); |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2310 |
|
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2311 |
Vehicle *v; |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2312 |
FOR_ALL_VEHICLES(v) { |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2313 |
if (v->orders != NULL && !v->orders->IsValid()) v->orders = NULL; |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2314 |
|
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2315 |
v->current_order.ConvertFromOldSavegame(); |
9941
8549448b55fa
(svn r14096) -Codechange: merge the shared order's vehicle list management to a single location.
rubidium
parents:
9888
diff
changeset
|
2316 |
if (v->type == VEH_ROAD && v->IsPrimaryVehicle() && v->FirstShared() == v) { |
8926
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2317 |
FOR_VEHICLE_ORDERS(v, order) order->SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS); |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2318 |
} |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2319 |
} |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2320 |
} else if (CheckSavegameVersion(94)) { |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2321 |
/* Unload and transfer are now mutual exclusive. */ |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2322 |
Order *order; |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2323 |
FOR_ALL_ORDERS(order) { |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2324 |
if ((order->GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) { |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2325 |
order->SetUnloadType(OUFB_TRANSFER); |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2326 |
order->SetLoadType(OLFB_NO_LOAD); |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2327 |
} |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2328 |
} |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2329 |
|
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2330 |
Vehicle *v; |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2331 |
FOR_ALL_VEHICLES(v) { |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2332 |
if ((v->current_order.GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) { |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2333 |
v->current_order.SetUnloadType(OUFB_TRANSFER); |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2334 |
v->current_order.SetLoadType(OLFB_NO_LOAD); |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2335 |
} |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2336 |
} |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2337 |
} |
888a242c523f
(svn r12696) -Fix: loading ancient savegames could result in invalid orders in order lists with all related problems.
rubidium
parents:
8919
diff
changeset
|
2338 |
|
8057
9a378e86100b
(svn r11618) -Fix: buoys are just waypoints, so don't allow load/unload/transfert for them
glx
parents:
8029
diff
changeset
|
2339 |
if (CheckSavegameVersion(84)) { |
8155
ab1e6353db79
(svn r11717) -Fix [FS#1590]: make sure invalid players have all shares owned by PLAYER_SPECTATOR
smatz
parents:
8152
diff
changeset
|
2340 |
/* Update go to buoy orders because they are just waypoints */ |
8057
9a378e86100b
(svn r11618) -Fix: buoys are just waypoints, so don't allow load/unload/transfert for them
glx
parents:
8029
diff
changeset
|
2341 |
Order *order; |
9a378e86100b
(svn r11618) -Fix: buoys are just waypoints, so don't allow load/unload/transfert for them
glx
parents:
8029
diff
changeset
|
2342 |
FOR_ALL_ORDERS(order) { |
8840
332412c2e9c1
(svn r12588) -Codechange: do not access the destination of an order directly.
rubidium
parents:
8838
diff
changeset
|
2343 |
if (order->IsType(OT_GOTO_STATION) && GetStation(order->GetDestination())->IsBuoy()) { |
8855
6d841d5d4789
(svn r12617) -Codechange: add type safety to the Order's load and unload types.
rubidium
parents:
8843
diff
changeset
|
2344 |
order->SetLoadType(OLF_LOAD_IF_POSSIBLE); |
6d841d5d4789
(svn r12617) -Codechange: add type safety to the Order's load and unload types.
rubidium
parents:
8843
diff
changeset
|
2345 |
order->SetUnloadType(OUF_UNLOAD_IF_POSSIBLE); |
8057
9a378e86100b
(svn r11618) -Fix: buoys are just waypoints, so don't allow load/unload/transfert for them
glx
parents:
8029
diff
changeset
|
2346 |
} |
9a378e86100b
(svn r11618) -Fix: buoys are just waypoints, so don't allow load/unload/transfert for them
glx
parents:
8029
diff
changeset
|
2347 |
} |
8155
ab1e6353db79
(svn r11717) -Fix [FS#1590]: make sure invalid players have all shares owned by PLAYER_SPECTATOR
smatz
parents:
8152
diff
changeset
|
2348 |
|
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2349 |
/* Set all share owners to INVALID_COMPANY for |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2350 |
* 1) all inactive companies |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2351 |
* (when inactive companies were stored in the savegame - TTD, TTDP and some |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2352 |
* *really* old revisions of OTTD; else it is already set in InitializeCompanies()) |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2353 |
* 2) shares that are owned by inactive companies or self |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2354 |
* (caused by cheating clients in earlier revisions) */ |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2355 |
FOR_ALL_COMPANIES(c) { |
9659
187142ff9b6c
(svn r13731) -Codechange: make a pool of the array of players.
rubidium
parents:
9655
diff
changeset
|
2356 |
for (uint i = 0; i < 4; i++) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2357 |
CompanyID company = c->share_owners[i]; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2358 |
if (company == INVALID_COMPANY) continue; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2359 |
if (!IsValidCompanyID(company) || company == c->index) c->share_owners[i] = INVALID_COMPANY; |
8155
ab1e6353db79
(svn r11717) -Fix [FS#1590]: make sure invalid players have all shares owned by PLAYER_SPECTATOR
smatz
parents:
8152
diff
changeset
|
2360 |
} |
ab1e6353db79
(svn r11717) -Fix [FS#1590]: make sure invalid players have all shares owned by PLAYER_SPECTATOR
smatz
parents:
8152
diff
changeset
|
2361 |
} |
8057
9a378e86100b
(svn r11618) -Fix: buoys are just waypoints, so don't allow load/unload/transfert for them
glx
parents:
8029
diff
changeset
|
2362 |
} |
9a378e86100b
(svn r11618) -Fix: buoys are just waypoints, so don't allow load/unload/transfert for them
glx
parents:
8029
diff
changeset
|
2363 |
|
8342
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8303
diff
changeset
|
2364 |
if (CheckSavegameVersion(86)) { |
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8303
diff
changeset
|
2365 |
for (TileIndex t = 0; t < map_size; t++) { |
8471
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2366 |
/* Move river flag and update canals to use water class */ |
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2367 |
if (IsTileType(t, MP_WATER)) { |
9200
ae323616f9ab
(svn r13066) -Fix [FS#2005]: loading of TTDP savegames with rivers in them.
rubidium
parents:
9184
diff
changeset
|
2368 |
if (GetWaterClass(t) != WATER_CLASS_RIVER) { |
8495
35c77bdca32a
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
frosch
parents:
8471
diff
changeset
|
2369 |
if (IsWater(t)) { |
35c77bdca32a
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
frosch
parents:
8471
diff
changeset
|
2370 |
Owner o = GetTileOwner(t); |
35c77bdca32a
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
frosch
parents:
8471
diff
changeset
|
2371 |
if (o == OWNER_WATER) { |
35c77bdca32a
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
frosch
parents:
8471
diff
changeset
|
2372 |
MakeWater(t); |
35c77bdca32a
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
frosch
parents:
8471
diff
changeset
|
2373 |
} else { |
35c77bdca32a
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
frosch
parents:
8471
diff
changeset
|
2374 |
MakeCanal(t, o, Random()); |
35c77bdca32a
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
frosch
parents:
8471
diff
changeset
|
2375 |
} |
35c77bdca32a
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
frosch
parents:
8471
diff
changeset
|
2376 |
} else if (IsShipDepot(t)) { |
35c77bdca32a
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
frosch
parents:
8471
diff
changeset
|
2377 |
Owner o = (Owner)_m[t].m4; // Original water owner |
35c77bdca32a
(svn r12070) -Cleanup(r12042): Water-owner of shipdepots is no longer needed. Removed.
frosch
parents:
8471
diff
changeset
|
2378 |
SetWaterClass(t, o == OWNER_WATER ? WATER_CLASS_SEA : WATER_CLASS_CANAL); |
8471
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2379 |
} |
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2380 |
} |
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2381 |
} |
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2382 |
} |
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2383 |
|
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2384 |
/* Update locks, depots, docks and buoys to have a water class based |
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2385 |
* on its neighbouring tiles. Done after river and canal updates to |
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2386 |
* ensure neighbours are correct. */ |
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2387 |
for (TileIndex t = 0; t < map_size; t++) { |
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2388 |
if (GetTileSlope(t, NULL) != SLOPE_FLAT) continue; |
ba4c15fe147b
(svn r12042) -Fix [FS#1676]: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
peter1138
parents:
8404
diff
changeset
|
2389 |
|
9718
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2390 |
if (IsTileType(t, MP_WATER) && IsLock(t)) SetWaterClassDependingOnSurroundings(t, false); |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2391 |
if (IsTileType(t, MP_STATION) && (IsDock(t) || IsBuoy(t))) SetWaterClassDependingOnSurroundings(t, false); |
8342
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8303
diff
changeset
|
2392 |
} |
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8303
diff
changeset
|
2393 |
} |
bf710180e7ce
(svn r11908) -Fix: update crossing when merging a company, when building a crossing and after loading older savegame
smatz
parents:
8303
diff
changeset
|
2394 |
|
8521
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2395 |
if (CheckSavegameVersion(87)) { |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2396 |
for (TileIndex t = 0; t < map_size; t++) { |
8613
931d28d5c075
(svn r12195) -Fix [FS#1787](r12100): there can be oil rigs at map borders, do not set water class for them
smatz
parents:
8598
diff
changeset
|
2397 |
/* skip oil rigs at borders! */ |
931d28d5c075
(svn r12195) -Fix [FS#1787](r12100): there can be oil rigs at map borders, do not set water class for them
smatz
parents:
8598
diff
changeset
|
2398 |
if ((IsTileType(t, MP_WATER) || IsBuoyTile(t)) && |
931d28d5c075
(svn r12195) -Fix [FS#1787](r12100): there can be oil rigs at map borders, do not set water class for them
smatz
parents:
8598
diff
changeset
|
2399 |
(TileX(t) == 0 || TileY(t) == 0 || TileX(t) == MapMaxX() - 1 || TileY(t) == MapMaxY() - 1)) { |
8525
2670d1ad818c
(svn r12100) -Fix (r12042): check for water class of surrounding tiles fails for buoys at map borders
smatz
parents:
8521
diff
changeset
|
2400 |
/* Some version 86 savegames have wrong water class at map borders (under buoy, or after removing buoy). |
2670d1ad818c
(svn r12100) -Fix (r12042): check for water class of surrounding tiles fails for buoys at map borders
smatz
parents:
8521
diff
changeset
|
2401 |
* This conversion has to be done before buoys with invalid owner are removed. */ |
2670d1ad818c
(svn r12100) -Fix (r12042): check for water class of surrounding tiles fails for buoys at map borders
smatz
parents:
8521
diff
changeset
|
2402 |
SetWaterClass(t, WATER_CLASS_SEA); |
2670d1ad818c
(svn r12100) -Fix (r12042): check for water class of surrounding tiles fails for buoys at map borders
smatz
parents:
8521
diff
changeset
|
2403 |
} |
2670d1ad818c
(svn r12100) -Fix (r12042): check for water class of surrounding tiles fails for buoys at map borders
smatz
parents:
8521
diff
changeset
|
2404 |
|
8521
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2405 |
if (IsBuoyTile(t) || IsDriveThroughStopTile(t) || IsTileType(t, MP_WATER)) { |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2406 |
Owner o = GetTileOwner(t); |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2407 |
if (o < MAX_COMPANIES && !IsValidCompanyID(o)) { |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2408 |
_current_company = o; |
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2409 |
ChangeTileOwner(t, o, INVALID_OWNER); |
8521
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2410 |
} |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2411 |
if (IsBuoyTile(t)) { |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2412 |
/* reset buoy owner to OWNER_NONE in the station struct |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2413 |
* (even if it is owned by active company) */ |
8521
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2414 |
GetStationByTile(t)->owner = OWNER_NONE; |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2415 |
} |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2416 |
} else if (IsTileType(t, MP_ROAD)) { |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2417 |
/* works for all RoadTileType */ |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2418 |
for (RoadType rt = ROADTYPE_ROAD; rt < ROADTYPE_END; rt++) { |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2419 |
/* update even non-existing road types to update tile owner too */ |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2420 |
Owner o = GetRoadOwner(t, rt); |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2421 |
if (o < MAX_COMPANIES && !IsValidCompanyID(o)) SetRoadOwner(t, rt, OWNER_NONE); |
8521
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2422 |
} |
8563
13b1a41e46f1
(svn r12141) -Codechange: Introduce IsNormalRoad[Tile](), IsRoadDepot[Tile]() and HasTileRoadType(); and use them.
frosch
parents:
8556
diff
changeset
|
2423 |
if (IsLevelCrossing(t)) { |
8521
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2424 |
Owner o = GetTileOwner(t); |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2425 |
if (!IsValidCompanyID(o)) { |
8521
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2426 |
/* remove leftover rail piece from crossing (from very old savegames) */ |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2427 |
_current_company = o; |
8598
ddd1f342b0da
(svn r12179) -Codechange: use GetCrossingRailTrack() and GetCrossingRailAxis() to improve code readability
smatz
parents:
8563
diff
changeset
|
2428 |
DoCommand(t, 0, GetCrossingRailTrack(t), DC_EXEC | DC_BANKRUPT, CMD_REMOVE_SINGLE_RAIL); |
8521
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2429 |
} |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2430 |
} |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2431 |
} |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2432 |
} |
8551
f0bcd6753287
(svn r12129) -Change [FS#1759]: simplified patch settings for pathfinders (Yorick)
smatz
parents:
8526
diff
changeset
|
2433 |
|
f0bcd6753287
(svn r12129) -Change [FS#1759]: simplified patch settings for pathfinders (Yorick)
smatz
parents:
8526
diff
changeset
|
2434 |
/* Convert old PF settings to new */ |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2435 |
if (_settings_game.pf.yapf.rail_use_yapf || CheckSavegameVersion(28)) { |
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2436 |
_settings_game.pf.pathfinder_for_trains = VPF_YAPF; |
8551
f0bcd6753287
(svn r12129) -Change [FS#1759]: simplified patch settings for pathfinders (Yorick)
smatz
parents:
8526
diff
changeset
|
2437 |
} else { |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2438 |
_settings_game.pf.pathfinder_for_trains = (_settings_game.pf.new_pathfinding_all ? VPF_NPF : VPF_NTP); |
8551
f0bcd6753287
(svn r12129) -Change [FS#1759]: simplified patch settings for pathfinders (Yorick)
smatz
parents:
8526
diff
changeset
|
2439 |
} |
f0bcd6753287
(svn r12129) -Change [FS#1759]: simplified patch settings for pathfinders (Yorick)
smatz
parents:
8526
diff
changeset
|
2440 |
|
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2441 |
if (_settings_game.pf.yapf.road_use_yapf || CheckSavegameVersion(28)) { |
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2442 |
_settings_game.pf.pathfinder_for_roadvehs = VPF_YAPF; |
8551
f0bcd6753287
(svn r12129) -Change [FS#1759]: simplified patch settings for pathfinders (Yorick)
smatz
parents:
8526
diff
changeset
|
2443 |
} else { |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2444 |
_settings_game.pf.pathfinder_for_roadvehs = (_settings_game.pf.new_pathfinding_all ? VPF_NPF : VPF_OPF); |
8551
f0bcd6753287
(svn r12129) -Change [FS#1759]: simplified patch settings for pathfinders (Yorick)
smatz
parents:
8526
diff
changeset
|
2445 |
} |
f0bcd6753287
(svn r12129) -Change [FS#1759]: simplified patch settings for pathfinders (Yorick)
smatz
parents:
8526
diff
changeset
|
2446 |
|
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2447 |
if (_settings_game.pf.yapf.ship_use_yapf) { |
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2448 |
_settings_game.pf.pathfinder_for_ships = VPF_YAPF; |
8551
f0bcd6753287
(svn r12129) -Change [FS#1759]: simplified patch settings for pathfinders (Yorick)
smatz
parents:
8526
diff
changeset
|
2449 |
} else { |
9413
7042a8ec3fa8
(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.
rubidium
parents:
9411
diff
changeset
|
2450 |
_settings_game.pf.pathfinder_for_ships = (_settings_game.pf.new_pathfinding_all ? VPF_NPF : VPF_OPF); |
8551
f0bcd6753287
(svn r12129) -Change [FS#1759]: simplified patch settings for pathfinders (Yorick)
smatz
parents:
8526
diff
changeset
|
2451 |
} |
8521
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2452 |
} |
8580cfbf1786
(svn r12096) -Fix: remove leftover property when loading older savegames
smatz
parents:
8513
diff
changeset
|
2453 |
|
8556
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8551
diff
changeset
|
2454 |
if (CheckSavegameVersion(88)) { |
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8551
diff
changeset
|
2455 |
/* Profits are now with 8 bit fract */ |
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8551
diff
changeset
|
2456 |
Vehicle *v; |
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8551
diff
changeset
|
2457 |
FOR_ALL_VEHICLES(v) { |
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8551
diff
changeset
|
2458 |
v->profit_this_year <<= 8; |
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8551
diff
changeset
|
2459 |
v->profit_last_year <<= 8; |
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8551
diff
changeset
|
2460 |
v->running_ticks = 0; |
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8551
diff
changeset
|
2461 |
} |
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8551
diff
changeset
|
2462 |
} |
ce8d86cc14d2
(svn r12134) -Change: count the number of ticks a vehicle was running this day to calculate running cost
smatz
parents:
8551
diff
changeset
|
2463 |
|
8681
c1853fb3c47a
(svn r12347) -Feature(ette): Increase house animation frame number from 32 to 128.
frosch
parents:
8670
diff
changeset
|
2464 |
if (CheckSavegameVersion(91)) { |
c1853fb3c47a
(svn r12347) -Feature(ette): Increase house animation frame number from 32 to 128.
frosch
parents:
8670
diff
changeset
|
2465 |
/* Increase HouseAnimationFrame from 5 to 7 bits */ |
c1853fb3c47a
(svn r12347) -Feature(ette): Increase house animation frame number from 32 to 128.
frosch
parents:
8670
diff
changeset
|
2466 |
for (TileIndex t = 0; t < map_size; t++) { |
c1853fb3c47a
(svn r12347) -Feature(ette): Increase house animation frame number from 32 to 128.
frosch
parents:
8670
diff
changeset
|
2467 |
if (IsTileType(t, MP_HOUSE) && GetHouseType(t) >= NEW_HOUSE_OFFSET) { |
c1853fb3c47a
(svn r12347) -Feature(ette): Increase house animation frame number from 32 to 128.
frosch
parents:
8670
diff
changeset
|
2468 |
SetHouseAnimationFrame(t, GB(_m[t].m6, 3, 5)); |
c1853fb3c47a
(svn r12347) -Feature(ette): Increase house animation frame number from 32 to 128.
frosch
parents:
8670
diff
changeset
|
2469 |
} |
c1853fb3c47a
(svn r12347) -Feature(ette): Increase house animation frame number from 32 to 128.
frosch
parents:
8670
diff
changeset
|
2470 |
} |
c1853fb3c47a
(svn r12347) -Feature(ette): Increase house animation frame number from 32 to 128.
frosch
parents:
8670
diff
changeset
|
2471 |
} |
c1853fb3c47a
(svn r12347) -Feature(ette): Increase house animation frame number from 32 to 128.
frosch
parents:
8670
diff
changeset
|
2472 |
|
9057
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2473 |
if (CheckSavegameVersion(62)) { |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2474 |
/* Remove all trams from savegames without tram support. |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2475 |
* There would be trams without tram track under causing crashes sooner or later. */ |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2476 |
Vehicle *v; |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2477 |
FOR_ALL_VEHICLES(v) { |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2478 |
if (v->type == VEH_ROAD && v->First() == v && |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2479 |
HasBit(EngInfo(v->engine_type)->misc_flags, EF_ROAD_TRAM)) { |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2480 |
if (_switch_mode_errorstr == INVALID_STRING_ID || _switch_mode_errorstr == STR_NEWGRF_COMPATIBLE_LOAD_WARNING) { |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2481 |
_switch_mode_errorstr = STR_LOADGAME_REMOVED_TRAMS; |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2482 |
} |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2483 |
delete v; |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2484 |
} |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2485 |
} |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2486 |
} |
610b26560a54
(svn r12904) -Fix [FS#1953]: remove trams from savegames saved in OTTD without tram support, it is better than to simply crash
smatz
parents:
9039
diff
changeset
|
2487 |
|
9718
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2488 |
if (CheckSavegameVersion(99)) { |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2489 |
for (TileIndex t = 0; t < map_size; t++) { |
10360
049db04f827f
(svn r14611) -Fix (r13437)[FS#2421]: Store the age of a house in the map array instead of the construction year.
frosch
parents:
10347
diff
changeset
|
2490 |
/* Set newly introduced WaterClass of industry tiles */ |
9718
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2491 |
if (IsTileType(t, MP_STATION) && IsOilRig(t)) { |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2492 |
SetWaterClassDependingOnSurroundings(t, true); |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2493 |
} |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2494 |
if (IsTileType(t, MP_INDUSTRY)) { |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2495 |
if ((GetIndustrySpec(GetIndustryType(t))->behaviour & INDUSTRYBEH_BUILT_ONWATER) != 0) { |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2496 |
SetWaterClassDependingOnSurroundings(t, true); |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2497 |
} else { |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2498 |
SetWaterClass(t, WATER_CLASS_INVALID); |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2499 |
} |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2500 |
} |
10360
049db04f827f
(svn r14611) -Fix (r13437)[FS#2421]: Store the age of a house in the map array instead of the construction year.
frosch
parents:
10347
diff
changeset
|
2501 |
|
049db04f827f
(svn r14611) -Fix (r13437)[FS#2421]: Store the age of a house in the map array instead of the construction year.
frosch
parents:
10347
diff
changeset
|
2502 |
/* Replace "house construction year" with "house age" */ |
049db04f827f
(svn r14611) -Fix (r13437)[FS#2421]: Store the age of a house in the map array instead of the construction year.
frosch
parents:
10347
diff
changeset
|
2503 |
if (IsTileType(t, MP_HOUSE) && IsHouseCompleted(t)) { |
049db04f827f
(svn r14611) -Fix (r13437)[FS#2421]: Store the age of a house in the map array instead of the construction year.
frosch
parents:
10347
diff
changeset
|
2504 |
_m[t].m5 = Clamp(_cur_year - (_m[t].m5 + ORIGINAL_BASE_YEAR), 0, 0xFF); |
049db04f827f
(svn r14611) -Fix (r13437)[FS#2421]: Store the age of a house in the map array instead of the construction year.
frosch
parents:
10347
diff
changeset
|
2505 |
} |
9718
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2506 |
} |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2507 |
} |
4b7468076d31
(svn r13838) -Codechange: Make industry tiles aware of WaterClasses.
frosch
parents:
9717
diff
changeset
|
2508 |
|
9790
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2509 |
/* Move the signal variant back up one bit for PBS. We don't convert the old PBS |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2510 |
* format here, as an old layout wouldn't work properly anyway. To be safe, we |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2511 |
* clear any possible PBS reservations as well. */ |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2512 |
if (CheckSavegameVersion(100)) { |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2513 |
for (TileIndex t = 0; t < map_size; t++) { |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2514 |
switch (GetTileType(t)) { |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2515 |
case MP_RAILWAY: |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2516 |
if (HasSignals(t)) { |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2517 |
/* move the signal variant */ |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2518 |
SetSignalVariant(t, TRACK_UPPER, HasBit(_m[t].m2, 2) ? SIG_SEMAPHORE : SIG_ELECTRIC); |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2519 |
SetSignalVariant(t, TRACK_LOWER, HasBit(_m[t].m2, 6) ? SIG_SEMAPHORE : SIG_ELECTRIC); |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2520 |
ClrBit(_m[t].m2, 2); |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2521 |
ClrBit(_m[t].m2, 6); |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2522 |
} |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2523 |
|
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2524 |
/* Clear PBS reservation on track */ |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2525 |
if (IsRailDepot(t) ||IsRailWaypoint(t)) { |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2526 |
SetDepotWaypointReservation(t, false); |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2527 |
} else { |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2528 |
SetTrackReservation(t, TRACK_BIT_NONE); |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2529 |
} |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2530 |
break; |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2531 |
|
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2532 |
case MP_ROAD: /* Clear PBS reservation on crossing */ |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2533 |
if (IsLevelCrossing(t)) SetCrossingReservation(t, false); |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2534 |
break; |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2535 |
|
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2536 |
case MP_STATION: /* Clear PBS reservation on station */ |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2537 |
if (IsRailwayStation(t)) SetRailwayStationReservation(t, false); |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2538 |
break; |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2539 |
|
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2540 |
case MP_TUNNELBRIDGE: /* Clear PBS reservation on tunnels/birdges */ |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2541 |
if (GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL) SetTunnelBridgeReservation(t, false); |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2542 |
break; |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2543 |
|
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2544 |
default: break; |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2545 |
} |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2546 |
} |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2547 |
} |
5d5c70e0334e
(svn r13932) -Add [YAPP]: PBS signals added to the map array. The signals are drawn using the old Patch-like PBS sprites. (michi_cc)
rubidium
parents:
9730
diff
changeset
|
2548 |
|
9888
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2549 |
/* Reserve all tracks trains are currently on. */ |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2550 |
if (CheckSavegameVersion(101)) { |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2551 |
Vehicle *v; |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2552 |
FOR_ALL_VEHICLES(v) { |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2553 |
if (v->type == VEH_TRAIN) { |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2554 |
if ((v->u.rail.track & TRACK_BIT_WORMHOLE) == TRACK_BIT_WORMHOLE) { |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2555 |
TryReserveRailTrack(v->tile, DiagDirToDiagTrack(GetTunnelBridgeDirection(v->tile))); |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2556 |
} else if ((v->u.rail.track & TRACK_BIT_MASK) != TRACK_BIT_NONE) { |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2557 |
TryReserveRailTrack(v->tile, TrackBitsToTrack(v->u.rail.track)); |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2558 |
} |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2559 |
} |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2560 |
} |
9978
4c10b20eaf54
(svn r14135) -Codechange: Add owner to waypoints. Previously, it was guessed from rail underneath it.
belugas
parents:
9950
diff
changeset
|
2561 |
|
4c10b20eaf54
(svn r14135) -Codechange: Add owner to waypoints. Previously, it was guessed from rail underneath it.
belugas
parents:
9950
diff
changeset
|
2562 |
/* Give owners to waypoints, based on rail tracks it is sitting on. |
4c10b20eaf54
(svn r14135) -Codechange: Add owner to waypoints. Previously, it was guessed from rail underneath it.
belugas
parents:
9950
diff
changeset
|
2563 |
* If none is available, specify OWNER_NONE */ |
4c10b20eaf54
(svn r14135) -Codechange: Add owner to waypoints. Previously, it was guessed from rail underneath it.
belugas
parents:
9950
diff
changeset
|
2564 |
Waypoint *wp; |
4c10b20eaf54
(svn r14135) -Codechange: Add owner to waypoints. Previously, it was guessed from rail underneath it.
belugas
parents:
9950
diff
changeset
|
2565 |
FOR_ALL_WAYPOINTS(wp) { |
10099
a42cafcba550
(svn r14280) -Codechange: use IsRailWaypointTile() instead of IsTileType() and IsRailWaypoint() checks at several places
smatz
parents:
10039
diff
changeset
|
2566 |
Owner owner = (IsRailWaypointTile(wp->xy) ? GetTileOwner(wp->xy) : OWNER_NONE); |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2567 |
wp->owner = IsValidCompanyID(owner) ? owner : OWNER_NONE; |
9978
4c10b20eaf54
(svn r14135) -Codechange: Add owner to waypoints. Previously, it was guessed from rail underneath it.
belugas
parents:
9950
diff
changeset
|
2568 |
} |
9888
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2569 |
} |
90d3e362b95c
(svn r14036) -Fix [FS#2197,FS#2198]: trains crashing into eachother when signals are changed (michi_cc)
rubidium
parents:
9790
diff
changeset
|
2570 |
|
10106
072a935ed4b1
(svn r14290) -Fix (r13932): level crossings could be barred when they shouldn't be after savegame conversion
smatz
parents:
10099
diff
changeset
|
2571 |
if (CheckSavegameVersion(102)) { |
072a935ed4b1
(svn r14290) -Fix (r13932): level crossings could be barred when they shouldn't be after savegame conversion
smatz
parents:
10099
diff
changeset
|
2572 |
for (TileIndex t = 0; t < map_size; t++) { |
072a935ed4b1
(svn r14290) -Fix (r13932): level crossings could be barred when they shouldn't be after savegame conversion
smatz
parents:
10099
diff
changeset
|
2573 |
/* Now all crossings should be in correct state */ |
072a935ed4b1
(svn r14290) -Fix (r13932): level crossings could be barred when they shouldn't be after savegame conversion
smatz
parents:
10099
diff
changeset
|
2574 |
if (IsLevelCrossingTile(t)) UpdateLevelCrossing(t, false); |
072a935ed4b1
(svn r14290) -Fix (r13932): level crossings could be barred when they shouldn't be after savegame conversion
smatz
parents:
10099
diff
changeset
|
2575 |
} |
072a935ed4b1
(svn r14290) -Fix (r13932): level crossings could be barred when they shouldn't be after savegame conversion
smatz
parents:
10099
diff
changeset
|
2576 |
} |
072a935ed4b1
(svn r14290) -Fix (r13932): level crossings could be barred when they shouldn't be after savegame conversion
smatz
parents:
10099
diff
changeset
|
2577 |
|
10158
8f570dcb0997
(svn r14348) -Fix (r1667): signs were not updated on company bankrupcy/sell, they have colour of invalid player
smatz
parents:
10153
diff
changeset
|
2578 |
if (CheckSavegameVersion(103)) { |
10289
801e5451f0ca
(svn r14528) -Codechange: cache the closest town for all road tiles instead of only roads owned by tiles. This replaces a O(n) search over all towns from the road's tileloop with a O(1) lookup (PhilSophus)
rubidium
parents:
10262
diff
changeset
|
2579 |
/* Non-town-owned roads now store the closest town */ |
10340
a4757ae623ca
(svn r14591) -Fix [FS#2388](r14528): cached nearest town could be invalid after importing older savegame and during town generation
smatz
parents:
10310
diff
changeset
|
2580 |
UpdateNearestTownForRoadTiles(false); |
10289
801e5451f0ca
(svn r14528) -Codechange: cache the closest town for all road tiles instead of only roads owned by tiles. This replaces a O(n) search over all towns from the road's tileloop with a O(1) lookup (PhilSophus)
rubidium
parents:
10262
diff
changeset
|
2581 |
|
10158
8f570dcb0997
(svn r14348) -Fix (r1667): signs were not updated on company bankrupcy/sell, they have colour of invalid player
smatz
parents:
10153
diff
changeset
|
2582 |
/* signs with invalid owner left from older savegames */ |
8f570dcb0997
(svn r14348) -Fix (r1667): signs were not updated on company bankrupcy/sell, they have colour of invalid player
smatz
parents:
10153
diff
changeset
|
2583 |
Sign *si; |
8f570dcb0997
(svn r14348) -Fix (r1667): signs were not updated on company bankrupcy/sell, they have colour of invalid player
smatz
parents:
10153
diff
changeset
|
2584 |
FOR_ALL_SIGNS(si) { |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2585 |
if (si->owner != OWNER_NONE && !IsValidCompanyID(si->owner)) si->owner = OWNER_NONE; |
10158
8f570dcb0997
(svn r14348) -Fix (r1667): signs were not updated on company bankrupcy/sell, they have colour of invalid player
smatz
parents:
10153
diff
changeset
|
2586 |
} |
10347
6da2d30f2fe8
(svn r14598) -Feature: Action0Industries property 24 (industry suuplies default name for nearby station).
rubidium
parents:
10340
diff
changeset
|
2587 |
|
6da2d30f2fe8
(svn r14598) -Feature: Action0Industries property 24 (industry suuplies default name for nearby station).
rubidium
parents:
10340
diff
changeset
|
2588 |
/* Station can get named based on an industry type, but the current ones |
6da2d30f2fe8
(svn r14598) -Feature: Action0Industries property 24 (industry suuplies default name for nearby station).
rubidium
parents:
10340
diff
changeset
|
2589 |
* are not, so mark them as if they are not named by an industry. */ |
6da2d30f2fe8
(svn r14598) -Feature: Action0Industries property 24 (industry suuplies default name for nearby station).
rubidium
parents:
10340
diff
changeset
|
2590 |
Station *st; |
6da2d30f2fe8
(svn r14598) -Feature: Action0Industries property 24 (industry suuplies default name for nearby station).
rubidium
parents:
10340
diff
changeset
|
2591 |
FOR_ALL_STATIONS(st) { |
6da2d30f2fe8
(svn r14598) -Feature: Action0Industries property 24 (industry suuplies default name for nearby station).
rubidium
parents:
10340
diff
changeset
|
2592 |
st->indtype = IT_INVALID; |
6da2d30f2fe8
(svn r14598) -Feature: Action0Industries property 24 (industry suuplies default name for nearby station).
rubidium
parents:
10340
diff
changeset
|
2593 |
} |
10158
8f570dcb0997
(svn r14348) -Fix (r1667): signs were not updated on company bankrupcy/sell, they have colour of invalid player
smatz
parents:
10153
diff
changeset
|
2594 |
} |
10106
072a935ed4b1
(svn r14290) -Fix (r13932): level crossings could be barred when they shouldn't be after savegame conversion
smatz
parents:
10099
diff
changeset
|
2595 |
|
10429
b81d72d5b44a
(svn r14682) -Fix (r14672): Check the correct savegame version. (Thanks SmatZ)
frosch
parents:
10419
diff
changeset
|
2596 |
if (CheckSavegameVersion(104)) { |
10419
d9a1fa739477
(svn r14672) -Fix [FS#2444]: Property 7 and callback 12 were broken for aircraft.
frosch
parents:
10380
diff
changeset
|
2597 |
Vehicle *v; |
d9a1fa739477
(svn r14672) -Fix [FS#2444]: Property 7 and callback 12 were broken for aircraft.
frosch
parents:
10380
diff
changeset
|
2598 |
FOR_ALL_VEHICLES(v) { |
d9a1fa739477
(svn r14672) -Fix [FS#2444]: Property 7 and callback 12 were broken for aircraft.
frosch
parents:
10380
diff
changeset
|
2599 |
/* Set engine_type of shadow and rotor */ |
d9a1fa739477
(svn r14672) -Fix [FS#2444]: Property 7 and callback 12 were broken for aircraft.
frosch
parents:
10380
diff
changeset
|
2600 |
if (v->type == VEH_AIRCRAFT && !IsNormalAircraft(v)) { |
d9a1fa739477
(svn r14672) -Fix [FS#2444]: Property 7 and callback 12 were broken for aircraft.
frosch
parents:
10380
diff
changeset
|
2601 |
v->engine_type = v->First()->engine_type; |
d9a1fa739477
(svn r14672) -Fix [FS#2444]: Property 7 and callback 12 were broken for aircraft.
frosch
parents:
10380
diff
changeset
|
2602 |
} |
d9a1fa739477
(svn r14672) -Fix [FS#2444]: Property 7 and callback 12 were broken for aircraft.
frosch
parents:
10380
diff
changeset
|
2603 |
} |
d9a1fa739477
(svn r14672) -Fix [FS#2444]: Property 7 and callback 12 were broken for aircraft.
frosch
parents:
10380
diff
changeset
|
2604 |
} |
d9a1fa739477
(svn r14672) -Fix [FS#2444]: Property 7 and callback 12 were broken for aircraft.
frosch
parents:
10380
diff
changeset
|
2605 |
|
9655
bab7f10b3130
(svn r13727) -Fix (r13375): compilation with NO_DEBUG_MESSAGES was broken
smatz
parents:
9652
diff
changeset
|
2606 |
GamelogPrintDebug(1); |
9457
75f11a6caef8
(svn r13375) -Add: logging of actions that could possibly cause desyncs and crashes to simplify debugging. See readme.txt for details
smatz
parents:
9429
diff
changeset
|
2607 |
|
7981
84dd1b37e314
(svn r11537) -Codechange: make it much harder to 'accidentally' add savegame conversion code after the window and cache initializations.
rubidium
parents:
7969
diff
changeset
|
2608 |
return InitializeWindowsAndCaches(); |
0 | 2609 |
} |
5352
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2610 |
|
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2611 |
/** Reload all NewGRF files during a running game. This is a cut-down |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2612 |
* version of AfterLoadGame(). |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2613 |
* XXX - We need to reset the vehicle position hash because with a non-empty |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2614 |
* hash AfterLoadVehicles() will loop infinitely. We need AfterLoadVehicles() |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2615 |
* to recalculate vehicle data as some NewGRF vehicle sets could have been |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2616 |
* removed or added and changed statistics */ |
6247 | 2617 |
void ReloadNewGRFData() |
5352
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2618 |
{ |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2619 |
/* reload grf data */ |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2620 |
GfxLoadSprites(); |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2621 |
LoadStringWidthTable(); |
9717
b7806a165a75
(svn r13836) -Fix [FS#2074]: Automatically recalculate inflation if NewGRFs are changed and cargo types are added, so that cargo payment rates are correct.
peter1138
parents:
9704
diff
changeset
|
2622 |
ResetEconomy(); |
5352
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2623 |
/* reload vehicles */ |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2624 |
ResetVehiclePosHash(); |
8172
bcad4f33bd3d
(svn r11735) -Fix [FS#1574]: Don't reset loading indicator IDs when only reloading NewGRFs.
peter1138
parents:
8157
diff
changeset
|
2625 |
AfterLoadVehicles(false); |
6196
ac5aa79d27ea
(svn r8976) -Codechange: Reinitialize all engines after grf files have been reloaded/changed.
Darkvater
parents:
6193
diff
changeset
|
2626 |
StartupEngines(); |
9220
125a9aaf4b0a
(svn r13086) -Fix: do not crash badly after loading a newgrf with engines in-game that often
smatz
parents:
9211
diff
changeset
|
2627 |
SetCachedEngineCounts(); |
5352
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2628 |
/* update station and waypoint graphics */ |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2629 |
AfterLoadWaypoints(); |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2630 |
AfterLoadStations(); |
8707
e57a09994e12
(svn r12381) -Fix [FS1835] [FS1535] (r11855): The number of houses wasn't computed right. A few other things regaring the updating had to be changed. Big thanks for support to frosch123 and SmatZ, to name just a few. (Inspired by a patch of bilbo)
skidd13
parents:
8681
diff
changeset
|
2631 |
/* Check and update house and town values */ |
e57a09994e12
(svn r12381) -Fix [FS1835] [FS1535] (r11855): The number of houses wasn't computed right. A few other things regaring the updating had to be changed. Big thanks for support to frosch123 and SmatZ, to name just a few. (Inspired by a patch of bilbo)
skidd13
parents:
8681
diff
changeset
|
2632 |
UpdateHousesAndTowns(); |
9230
6710ef7d0226
(svn r13096) -Codechange: resize SelectPlayerLiveryWindow dynamically on _loaded_newgrf_feature.has_2CC changes
glx
parents:
9220
diff
changeset
|
2633 |
/* Update livery selection windows */ |
10207
c291a21b304e
(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.
rubidium
parents:
10195
diff
changeset
|
2634 |
for (CompanyID i = COMPANY_FIRST; i < MAX_COMPANIES; i++) InvalidateWindowData(WC_COMPANY_COLOR, i, _loaded_newgrf_features.has_2CC); |
5352
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2635 |
/* redraw the whole screen */ |
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2636 |
MarkWholeScreenDirty(); |
9704
54123af5f9a5
(svn r13816) -Fix [FS#2150]: check for vehicle length changes outside a depot (callback 0x11) and give a warning about that
smatz
parents:
9667
diff
changeset
|
2637 |
CheckTrainsLengths(); |
5352
86fca6a41aa1
(svn r7523) -Feature: Add the possibility to change the newgrf configuration of a running game.
Darkvater
parents:
5350
diff
changeset
|
2638 |
} |