Mercurial > hg > openttd
annotate src/saveload/afterload.cpp @ 17123:a18c14f0bb2b draft
(svn r21860) -Codechange: Rename road vehicle subtype functions to match the train names.
author | terkhen <terkhen@openttd.org> |
---|---|
date | Wed, 19 Jan 2011 18:44:13 +0000 |
parents | 2bbacb524f85 |
children | d2394a934993 |
rev | line source |
---|---|
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1 /* $Id$ */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2 |
12778
bc7926153e19
(svn r17248) -Fix: add GPL license notice where appropriate
rubidium <rubidium@openttd.org>
parents:
12749
diff
changeset
|
3 /* |
bc7926153e19
(svn r17248) -Fix: add GPL license notice where appropriate
rubidium <rubidium@openttd.org>
parents:
12749
diff
changeset
|
4 * This file is part of OpenTTD. |
bc7926153e19
(svn r17248) -Fix: add GPL license notice where appropriate
rubidium <rubidium@openttd.org>
parents:
12749
diff
changeset
|
5 * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. |
bc7926153e19
(svn r17248) -Fix: add GPL license notice where appropriate
rubidium <rubidium@openttd.org>
parents:
12749
diff
changeset
|
6 * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
bc7926153e19
(svn r17248) -Fix: add GPL license notice where appropriate
rubidium <rubidium@openttd.org>
parents:
12749
diff
changeset
|
7 * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. |
bc7926153e19
(svn r17248) -Fix: add GPL license notice where appropriate
rubidium <rubidium@openttd.org>
parents:
12749
diff
changeset
|
8 */ |
bc7926153e19
(svn r17248) -Fix: add GPL license notice where appropriate
rubidium <rubidium@openttd.org>
parents:
12749
diff
changeset
|
9 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
10 /** @file afterload.cpp Code updating data after game load */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
11 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
12 #include "../stdafx.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
13 #include "../void_map.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
14 #include "../signs_base.h" |
12999
07a634b14de8
(svn r17493) -Codechange: store the depot index on the map
rubidium <rubidium@openttd.org>
parents:
12998
diff
changeset
|
15 #include "../depot_base.h" |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
16 #include "../window_func.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
17 #include "../fios.h" |
12786
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
18 #include "../gamelog_internal.h" |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
19 #include "../network/network.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
20 #include "../gfxinit.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
21 #include "../functions.h" |
12826
c2f3eaf3b353
(svn r17316) -Codechange: use Industry::GetByTile() instead of GetIndustryByTile()
smatz <smatz@openttd.org>
parents:
12810
diff
changeset
|
22 #include "../industry.h" |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
23 #include "../clear_map.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
24 #include "../vehicle_func.h" |
13850
da5eda07b403
(svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies
rubidium <rubidium@openttd.org>
parents:
13835
diff
changeset
|
25 #include "../string_func.h" |
da5eda07b403
(svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies
rubidium <rubidium@openttd.org>
parents:
13835
diff
changeset
|
26 #include "../date_func.h" |
da5eda07b403
(svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies
rubidium <rubidium@openttd.org>
parents:
13835
diff
changeset
|
27 #include "../roadveh.h" |
da5eda07b403
(svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies
rubidium <rubidium@openttd.org>
parents:
13835
diff
changeset
|
28 #include "../train.h" |
da5eda07b403
(svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies
rubidium <rubidium@openttd.org>
parents:
13835
diff
changeset
|
29 #include "../station_base.h" |
da5eda07b403
(svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies
rubidium <rubidium@openttd.org>
parents:
13835
diff
changeset
|
30 #include "../waypoint_base.h" |
13859
e6ee12f4541d
(svn r18388) -Codechange: move entering/leaving of road stops to functions of RoadStop
rubidium <rubidium@openttd.org>
parents:
13856
diff
changeset
|
31 #include "../roadstop_base.h" |
13850
da5eda07b403
(svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies
rubidium <rubidium@openttd.org>
parents:
13835
diff
changeset
|
32 #include "../tunnelbridge_map.h" |
da5eda07b403
(svn r18379) -Codechange: move the cache updating function to its own header to reduce the include 'pathfinder' dependencies
rubidium <rubidium@openttd.org>
parents:
13835
diff
changeset
|
33 #include "../pathfinder/yapf/yapf_cache.h" |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
34 #include "../elrail_func.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
35 #include "../signs_func.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
36 #include "../aircraft.h" |
15744
f9e8032ac213
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
rubidium <rubidium@openttd.org>
parents:
15709
diff
changeset
|
37 #include "../object_map.h" |
15807
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
38 #include "../object_base.h" |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
39 #include "../tree_map.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
40 #include "../company_func.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
41 #include "../road_cmd.h" |
10696
7edccbb67398
(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
truebrain <truebrain@openttd.org>
parents:
10647
diff
changeset
|
42 #include "../ai/ai.hpp" |
14805
1d2b20b90ce2
(svn r19395) -Fix [FS#3669]: the AI Debug window didn't open if an AI or library fails to compile when loading a savegame
Yexo <Yexo@openttd.org>
parents:
14793
diff
changeset
|
43 #include "../ai/ai_gui.hpp" |
12249
559350145373
(svn r16664) -Codechange: move house-related stuff from town.h and town_type.h to separate files
smatz <smatz@openttd.org>
parents:
12239
diff
changeset
|
44 #include "../town.h" |
12279
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
45 #include "../economy_base.h" |
12292
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
46 #include "../animated_tile_func.h" |
12297
39ea618c207e
(svn r16714) -Codechange: use pool-like accessors for Subsidy
smatz <smatz@openttd.org>
parents:
12294
diff
changeset
|
47 #include "../subsidy_base.h" |
12658
b75d8c6681bd
(svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source
smatz <smatz@openttd.org>
parents:
12652
diff
changeset
|
48 #include "../subsidy_func.h" |
14258
a899d4e5ee1a
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
rubidium <rubidium@openttd.org>
parents:
14213
diff
changeset
|
49 #include "../newgrf.h" |
a899d4e5ee1a
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
rubidium <rubidium@openttd.org>
parents:
14213
diff
changeset
|
50 #include "../engine_func.h" |
15221
0d1472229334
(svn r19850) -Codechange: move declaration of InitializeRailGUI() to rail_gui.h
smatz <smatz@openttd.org>
parents:
15170
diff
changeset
|
51 #include "../rail_gui.h" |
15279
4e1862aebea2
(svn r19914) -Codechange: Wrap a helper class around temporary assignments of _current_company to ensure proper restoration.
frosch <frosch@openttd.org>
parents:
15221
diff
changeset
|
52 #include "../core/backup_type.hpp" |
16982
27ab8bdc8e03
(svn r21718) -Feature: Show a list of companies in the owner legend.
terkhen <terkhen@openttd.org>
parents:
16922
diff
changeset
|
53 #include "../smallmap_gui.h" |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
54 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
55 #include "table/strings.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
56 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
57 #include "saveload_internal.h" |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
58 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
59 #include <signal.h> |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
60 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
61 extern StringID _switch_mode_errorstr; |
12810
0400e81a3cc9
(svn r17298) -Fix [FS#3153]: reloading an AI started a new AI in the first available company slot causing other AIs to be started
yexo <yexo@openttd.org>
parents:
12786
diff
changeset
|
62 extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = INVALID_COMPANY); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
63 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
64 /** |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
65 * Makes a tile canal or water depending on the surroundings. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
66 * |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
67 * Must only be used for converting old savegames. Use WaterClass now. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
68 * |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
69 * This as for example docks and shipdepots do not store |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
70 * whether the tile used to be canal or 'normal' water. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
71 * @param t the tile to change. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
72 * @param include_invalid_water_class Also consider WATER_CLASS_INVALID, i.e. industry tiles on land |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
73 */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
74 void SetWaterClassDependingOnSurroundings(TileIndex t, bool include_invalid_water_class) |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
75 { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
76 /* If the slope is not flat, we always assume 'land' (if allowed). Also for one-corner-raised-shores. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
77 * Note: Wrt. autosloping under industry tiles this is the most fool-proof behaviour. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
78 if (GetTileSlope(t, NULL) != SLOPE_FLAT) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
79 if (include_invalid_water_class) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
80 SetWaterClass(t, WATER_CLASS_INVALID); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
81 return; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
82 } else { |
16123
a73c48c80b5d
(svn r20819) -Fix [FS#3714]: be a bit more "lenient" w.r.t. invalid savegames; don't crash on saveload related NOT_REACHEDs, just show the user an error that the savegame is corrupted
rubidium <rubidium@openttd.org>
parents:
16122
diff
changeset
|
83 SlErrorCorrupt("Invalid water class for dry tile"); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
84 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
85 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
86 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
87 /* Mark tile dirty in all cases */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
88 MarkTileDirtyByTile(t); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
89 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
90 if (TileX(t) == 0 || TileY(t) == 0 || TileX(t) == MapMaxX() - 1 || TileY(t) == MapMaxY() - 1) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
91 /* tiles at map borders are always WATER_CLASS_SEA */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
92 SetWaterClass(t, WATER_CLASS_SEA); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
93 return; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
94 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
95 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
96 bool has_water = false; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
97 bool has_canal = false; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
98 bool has_river = false; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
99 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
100 for (DiagDirection dir = DIAGDIR_BEGIN; dir < DIAGDIR_END; dir++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
101 TileIndex neighbour = TileAddByDiagDir(t, dir); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
102 switch (GetTileType(neighbour)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
103 case MP_WATER: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
104 /* clear water and shipdepots have already a WaterClass associated */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
105 if (IsCoast(neighbour)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
106 has_water = true; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
107 } else if (!IsLock(neighbour)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
108 switch (GetWaterClass(neighbour)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
109 case WATER_CLASS_SEA: has_water = true; break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
110 case WATER_CLASS_CANAL: has_canal = true; break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
111 case WATER_CLASS_RIVER: has_river = true; break; |
16123
a73c48c80b5d
(svn r20819) -Fix [FS#3714]: be a bit more "lenient" w.r.t. invalid savegames; don't crash on saveload related NOT_REACHEDs, just show the user an error that the savegame is corrupted
rubidium <rubidium@openttd.org>
parents:
16122
diff
changeset
|
112 default: SlErrorCorrupt("Invalid water class for tile"); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
113 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
114 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
115 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
116 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
117 case MP_RAILWAY: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
118 /* Shore or flooded halftile */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
119 has_water |= (GetRailGroundType(neighbour) == RAIL_GROUND_WATER); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
120 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
121 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
122 case MP_TREES: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
123 /* trees on shore */ |
14171
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
124 has_water |= (GB(_m[neighbour].m2, 4, 2) == TREE_GROUND_SHORE); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
125 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
126 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
127 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
128 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
129 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
130 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
131 if (!has_water && !has_canal && !has_river && include_invalid_water_class) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
132 SetWaterClass(t, WATER_CLASS_INVALID); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
133 return; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
134 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
135 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
136 if (has_river && !has_canal) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
137 SetWaterClass(t, WATER_CLASS_RIVER); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
138 } else if (has_canal || !has_water) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
139 SetWaterClass(t, WATER_CLASS_CANAL); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
140 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
141 SetWaterClass(t, WATER_CLASS_SEA); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
142 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
143 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
144 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
145 static void ConvertTownOwner() |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
146 { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
147 for (TileIndex tile = 0; tile != MapSize(); tile++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
148 switch (GetTileType(tile)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
149 case MP_ROAD: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
150 if (GB(_m[tile].m5, 4, 2) == ROAD_TILE_CROSSING && HasBit(_m[tile].m3, 7)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
151 _m[tile].m3 = OWNER_TOWN; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
152 } |
15579
5f128be91f59
(svn r20239) -Doc: Give a common name to all fall throughs (FALL THROUGH).
terkhen <terkhen@openttd.org>
parents:
15552
diff
changeset
|
153 /* FALL THROUGH */ |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
154 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
155 case MP_TUNNELBRIDGE: |
17056
8d85ca97b9b1
(svn r21793) -Fix (r20446): broken usage of GetTileOwner() caused wrong conversion of old savegames
smatz <smatz@openttd.org>
parents:
17049
diff
changeset
|
156 if (_m[tile].m1 & 0x80) SetTileOwner(tile, OWNER_TOWN); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
157 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
158 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
159 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
160 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
161 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
162 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
163 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
164 /* since savegame version 4.1, exclusive transport rights are stored at towns */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
165 static void UpdateExclusiveRights() |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
166 { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
167 Town *t; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
168 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
169 FOR_ALL_TOWNS(t) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
170 t->exclusivity = INVALID_COMPANY; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
171 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
172 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
173 /* FIXME old exclusive rights status is not being imported (stored in s->blocked_months_obsolete) |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
174 * could be implemented this way: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
175 * 1.) Go through all stations |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
176 * Build an array town_blocked[ town_id ][ company_id ] |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
177 * that stores if at least one station in that town is blocked for a company |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
178 * 2.) Go through that array, if you find a town that is not blocked for |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
179 * one company, but for all others, then give him exclusivity. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
180 */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
181 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
182 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
183 static const byte convert_currency[] = { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
184 0, 1, 12, 8, 3, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
185 10, 14, 19, 4, 5, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
186 9, 11, 13, 6, 17, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
187 16, 22, 21, 7, 15, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
188 18, 2, 20, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
189 }; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
190 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
191 /* since savegame version 4.2 the currencies are arranged differently */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
192 static void UpdateCurrencies() |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
193 { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
194 _settings_game.locale.currency = convert_currency[_settings_game.locale.currency]; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
195 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
196 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
197 /* Up to revision 1413 the invisible tiles at the southern border have not been |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
198 * MP_VOID, even though they should have. This is fixed by this function |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
199 */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
200 static void UpdateVoidTiles() |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
201 { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
202 uint i; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
203 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
204 for (i = 0; i < MapMaxY(); ++i) MakeVoid(i * MapSizeX() + MapMaxX()); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
205 for (i = 0; i < MapSizeX(); ++i) MakeVoid(MapSizeX() * MapMaxY() + i); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
206 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
207 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
208 static inline RailType UpdateRailType(RailType rt, RailType min) |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
209 { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
210 return rt >= min ? (RailType)(rt + 1): rt; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
211 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
212 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
213 /** |
13950
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
214 * Update the viewport coordinates of all signs. |
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
215 */ |
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
216 void UpdateAllVirtCoords() |
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
217 { |
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
218 UpdateAllStationVirtCoords(); |
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
219 UpdateAllSignVirtCoords(); |
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
220 UpdateAllTownVirtCoords(); |
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
221 } |
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
222 |
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
223 /** |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
224 * Initialization of the windows and several kinds of caches. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
225 * This is not done directly in AfterLoadGame because these |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
226 * functions require that all saveload conversions have been |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
227 * done. As people tend to add savegame conversion stuff after |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
228 * the intialization of the windows and caches quite some bugs |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
229 * had been made. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
230 * Moving this out of there is both cleaner and less bug-prone. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
231 */ |
12749
27a938bed307
(svn r17215) -Cleanup: remove unused return value
yexo <yexo@openttd.org>
parents:
12669
diff
changeset
|
232 static void InitializeWindowsAndCaches() |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
233 { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
234 /* Initialize windows */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
235 ResetWindowSystem(); |
11085
8da1855e9f14
(svn r15428) -Codechange: consistently use colour instead of having both color and colour.
rubidium <rubidium@openttd.org>
parents:
11069
diff
changeset
|
236 SetupColoursAndInitialWindow(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
237 |
13950
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
238 /* Update coordinates of the signs. */ |
77bfe67f23bd
(svn r18486) -Fix: when switching language and you're getting a different font, recalculate the coordinates/sizes of the viewport signs. Otherwise it gets glitchy or abbreviated (in the smallmap)
rubidium <rubidium@openttd.org>
parents:
13875
diff
changeset
|
239 UpdateAllVirtCoords(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
240 ResetViewportAfterLoadGame(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
241 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
242 Company *c; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
243 FOR_ALL_COMPANIES(c) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
244 /* For each company, verify (while loading a scenario) that the inauguration date is the current year and set it |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
245 * accordingly if it is not the case. No need to set it on companies that are not been used already, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
246 * thus the MIN_YEAR (which is really nothing more than Zero, initialized value) test */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
247 if (_file_to_saveload.filetype == FT_SCENARIO && c->inaugurated_year != MIN_YEAR) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
248 c->inaugurated_year = _cur_year; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
249 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
250 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
251 |
12940
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
252 RecomputePrices(); |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
253 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
254 SetCachedEngineCounts(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
255 |
12239
b1d30d9d4025
(svn r16654) -Codechange: cache industries in station's coverage area instead of searching them everytime payment is made
smatz <smatz@openttd.org>
parents:
12228
diff
changeset
|
256 Station::RecomputeIndustriesNearForAll(); |
12658
b75d8c6681bd
(svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source
smatz <smatz@openttd.org>
parents:
12652
diff
changeset
|
257 RebuildSubsidisedSourceAndDestinationCache(); |
12239
b1d30d9d4025
(svn r16654) -Codechange: cache industries in station's coverage area instead of searching them everytime payment is made
smatz <smatz@openttd.org>
parents:
12228
diff
changeset
|
258 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
259 /* Towns have a noise controlled number of airports system |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
260 * So each airport's noise value must be added to the town->noise_reached value |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
261 * Reset each town's noise_reached value to '0' before. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
262 UpdateAirportsNoise(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
263 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
264 CheckTrainsLengths(); |
13968
070572f1272d
(svn r18506) -Fix [FS#3368]: no error message was created for the first fatal NewGRF error.
rubidium <rubidium@openttd.org>
parents:
13950
diff
changeset
|
265 ShowNewGRFError(); |
14805
1d2b20b90ce2
(svn r19395) -Fix [FS#3669]: the AI Debug window didn't open if an AI or library fails to compile when loading a savegame
Yexo <Yexo@openttd.org>
parents:
14793
diff
changeset
|
266 ShowAIDebugWindowIfAIError(); |
16982
27ab8bdc8e03
(svn r21718) -Feature: Show a list of companies in the owner legend.
terkhen <terkhen@openttd.org>
parents:
16922
diff
changeset
|
267 |
27ab8bdc8e03
(svn r21718) -Feature: Show a list of companies in the owner legend.
terkhen <terkhen@openttd.org>
parents:
16922
diff
changeset
|
268 /* Rebuild the smallmap list of owners. */ |
27ab8bdc8e03
(svn r21718) -Feature: Show a list of companies in the owner legend.
terkhen <terkhen@openttd.org>
parents:
16922
diff
changeset
|
269 BuildOwnerLegend(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
270 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
271 |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
272 typedef void (CDECL *SignalHandlerPointer)(int); |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
273 static SignalHandlerPointer _prev_segfault = NULL; |
12156
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
274 static SignalHandlerPointer _prev_abort = NULL; |
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
275 static SignalHandlerPointer _prev_fpe = NULL; |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
276 |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
277 static void CDECL HandleSavegameLoadCrash(int signum); |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
278 |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
279 /** |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
280 * Replaces signal handlers of SIGSEGV and SIGABRT |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
281 * and stores pointers to original handlers in memory. |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
282 */ |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
283 static void SetSignalHandlers() |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
284 { |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
285 _prev_segfault = signal(SIGSEGV, HandleSavegameLoadCrash); |
12156
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
286 _prev_abort = signal(SIGABRT, HandleSavegameLoadCrash); |
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
287 _prev_fpe = signal(SIGFPE, HandleSavegameLoadCrash); |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
288 } |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
289 |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
290 /** |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
291 * Resets signal handlers back to original handlers. |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
292 */ |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
293 static void ResetSignalHandlers() |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
294 { |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
295 signal(SIGSEGV, _prev_segfault); |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
296 signal(SIGABRT, _prev_abort); |
12156
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
297 signal(SIGFPE, _prev_fpe); |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
298 } |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
299 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
300 /** |
12786
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
301 * Try to find the overridden GRF identifier of the given GRF. |
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
302 * @param c the GRF to get the 'previous' version of. |
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
303 * @return the GRF identifier or \a c if none could be found. |
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
304 */ |
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
305 static const GRFIdentifier *GetOverriddenIdentifier(const GRFConfig *c) |
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
306 { |
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
307 const LoggedAction *la = &_gamelog_action[_gamelog_actions - 1]; |
14676
353df593bee0
(svn r19255) -Codechange: encapsulate GRFIdentifier in GRFConfig instead of subclassing it
yexo <yexo@openttd.org>
parents:
14621
diff
changeset
|
308 if (la->at != GLAT_LOAD) return &c->ident; |
12786
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
309 |
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
310 const LoggedChange *lcend = &la->change[la->changes]; |
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
311 for (const LoggedChange *lc = la->change; lc != lcend; lc++) { |
14676
353df593bee0
(svn r19255) -Codechange: encapsulate GRFIdentifier in GRFConfig instead of subclassing it
yexo <yexo@openttd.org>
parents:
14621
diff
changeset
|
312 if (lc->ct == GLCT_GRFCOMPAT && lc->grfcompat.grfid == c->ident.grfid) return &lc->grfcompat; |
12786
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
313 } |
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
314 |
14676
353df593bee0
(svn r19255) -Codechange: encapsulate GRFIdentifier in GRFConfig instead of subclassing it
yexo <yexo@openttd.org>
parents:
14621
diff
changeset
|
315 return &c->ident; |
12786
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
316 } |
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
317 |
14279
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
318 /** Was the saveload crash because of missing NewGRFs? */ |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
319 static bool _saveload_crash_with_missing_newgrfs = false; |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
320 |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
321 /** |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
322 * Did loading the savegame cause a crash? If so, |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
323 * were NewGRFs missing? |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
324 * @return when the saveload crashed due to missing NewGRFs. |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
325 */ |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
326 bool SaveloadCrashWithMissingNewGRFs() |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
327 { |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
328 return _saveload_crash_with_missing_newgrfs; |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
329 } |
22e76a982410
(svn r18831) -Change [FS#3537]: do not go into the crashlog handler in case loading a savegame misses with missing NewGRFs. This way the load game crash handler gets better visibility and the user is instructed to find the missing NewGRFs before filing a bug report
rubidium <rubidium@openttd.org>
parents:
14261
diff
changeset
|
330 |
12786
0745055d8e85
(svn r17267) -Change [FS#3139]: mention the MD5 checksum of the original NewGRF in the "saveload failed horribly"-error message and make it more clear that the filename is of the current NewGRF
rubidium <rubidium@openttd.org>
parents:
12778
diff
changeset
|
331 /** |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
332 * Signal handler used to give a user a more useful report for crashes during |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
333 * the savegame loading process; especially when there's problems with the |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
334 * NewGRFs that are required by the savegame. |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
335 * @param signum received signal |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
336 */ |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
337 static void CDECL HandleSavegameLoadCrash(int signum) |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
338 { |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
339 ResetSignalHandlers(); |
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
340 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
341 char buffer[8192]; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
342 char *p = buffer; |
16122
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
343 p += seprintf(p, lastof(buffer), "Loading your savegame caused OpenTTD to crash.\n"); |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
344 |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
345 for (const GRFConfig *c = _grfconfig; !_saveload_crash_with_missing_newgrfs && c != NULL; c = c->next) { |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
346 _saveload_crash_with_missing_newgrfs = HasBit(c->flags, GCF_COMPATIBLE) || c->status == GCS_NOT_FOUND; |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
347 } |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
348 |
16122
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
349 if (_saveload_crash_with_missing_newgrfs) { |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
350 p += seprintf(p, lastof(buffer), |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
351 "This is most likely caused by a missing NewGRF or a NewGRF that\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
352 "has been loaded as replacement for a missing NewGRF. OpenTTD\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
353 "cannot easily determine whether a replacement NewGRF is of a newer\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
354 "or older version.\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
355 "It will load a NewGRF with the same GRF ID as the missing NewGRF.\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
356 "This means that if the author makes incompatible NewGRFs with the\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
357 "same GRF ID OpenTTD cannot magically do the right thing. In most\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
358 "cases OpenTTD will load the savegame and not crash, but this is an\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
359 "exception.\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
360 "Please load the savegame with the appropriate NewGRFs installed.\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
361 "The missing/compatible NewGRFs are:\n"); |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
362 |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
363 for (const GRFConfig *c = _grfconfig; c != NULL; c = c->next) { |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
364 if (HasBit(c->flags, GCF_COMPATIBLE)) { |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
365 const GRFIdentifier *replaced = GetOverriddenIdentifier(c); |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
366 char buf[40]; |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
367 md5sumToString(buf, lastof(buf), replaced->md5sum); |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
368 p += seprintf(p, lastof(buffer), "NewGRF %08X (checksum %s) not found.\n Loaded NewGRF \"%s\" with same GRF ID instead.\n", BSWAP32(c->ident.grfid), buf, c->filename); |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
369 } |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
370 if (c->status == GCS_NOT_FOUND) { |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
371 char buf[40]; |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
372 md5sumToString(buf, lastof(buf), c->ident.md5sum); |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
373 p += seprintf(p, lastof(buffer), "NewGRF %08X (%s) not found; checksum %s.\n", BSWAP32(c->ident.grfid), c->filename, buf); |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
374 } |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
375 } |
16122
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
376 } else { |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
377 p += seprintf(p, lastof(buffer), |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
378 "This is probably caused by a corruption in the savegame.\n" |
9994b0118198
(svn r20818) -Fix [FS#3791]: make the crash-on-saveload message clearer and more correct
rubidium <rubidium@openttd.org>
parents:
16120
diff
changeset
|
379 "Please file a bug report and attach this savegame.\n"); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
380 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
381 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
382 ShowInfo(buffer); |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
383 |
12156
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
384 SignalHandlerPointer call = NULL; |
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
385 switch (signum) { |
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
386 case SIGSEGV: call = _prev_segfault; break; |
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
387 case SIGABRT: call = _prev_abort; break; |
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
388 case SIGFPE: call = _prev_fpe; break; |
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
389 default: NOT_REACHED(); |
292dc6ec679f
(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.
rubidium <rubidium@openttd.org>
parents:
12137
diff
changeset
|
390 } |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
391 if (call != NULL) call(signum); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
392 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
393 |
10848
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
394 /** |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
395 * Tries to change owner of this rail tile to a valid owner. In very old versions it could happen that |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
396 * a rail track had an invalid owner. When conversion isn't possible, track is removed. |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
397 * @param t tile to update |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
398 */ |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
399 static void FixOwnerOfRailTrack(TileIndex t) |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
400 { |
11924
fccc9cea27a7
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
smatz <smatz@openttd.org>
parents:
11922
diff
changeset
|
401 assert(!Company::IsValidID(GetTileOwner(t)) && (IsLevelCrossingTile(t) || IsPlainRailTile(t))); |
10848
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
402 |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
403 /* remove leftover rail piece from crossing (from very old savegames) */ |
12035
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
404 Train *v = NULL, *w; |
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
405 FOR_ALL_TRAINS(w) { |
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
406 if (w->tile == t) { |
10848
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
407 v = w; |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
408 break; |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
409 } |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
410 } |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
411 |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
412 if (v != NULL) { |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
413 /* when there is a train on crossing (it could happen in TTD), set owner of crossing to train owner */ |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
414 SetTileOwner(t, v->owner); |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
415 return; |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
416 } |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
417 |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
418 /* try to find any connected rail */ |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
419 for (DiagDirection dd = DIAGDIR_BEGIN; dd < DIAGDIR_END; dd++) { |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
420 TileIndex tt = t + TileOffsByDiagDir(dd); |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
421 if (GetTileTrackStatus(t, TRANSPORT_RAIL, 0, dd) != 0 && |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
422 GetTileTrackStatus(tt, TRANSPORT_RAIL, 0, ReverseDiagDir(dd)) != 0 && |
11924
fccc9cea27a7
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
smatz <smatz@openttd.org>
parents:
11922
diff
changeset
|
423 Company::IsValidID(GetTileOwner(tt))) { |
10848
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
424 SetTileOwner(t, GetTileOwner(tt)); |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
425 return; |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
426 } |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
427 } |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
428 |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
429 if (IsLevelCrossingTile(t)) { |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
430 /* else change the crossing to normal road (road vehicles won't care) */ |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
431 MakeRoadNormal(t, GetCrossingRoadBits(t), GetRoadTypes(t), GetTownIndex(t), |
11252
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
432 GetRoadOwner(t, ROADTYPE_ROAD), GetRoadOwner(t, ROADTYPE_TRAM)); |
10848
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
433 return; |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
434 } |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
435 |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
436 /* if it's not a crossing, make it clean land */ |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
437 MakeClear(t, CLEAR_GRASS, 0); |
51cf93516bd6
(svn r15183) -Fix: stand-alone rail tiles with invalid owner were not removed. Also, make the whole check a bit more intelligent.
smatz <smatz@openttd.org>
parents:
10846
diff
changeset
|
438 } |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
439 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
440 bool AfterLoadGame() |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
441 { |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
442 SetSignalHandlers(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
443 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
444 TileIndex map_size = MapSize(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
445 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
446 if (IsSavegameVersionBefore(98)) GamelogOldver(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
447 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
448 GamelogTestRevision(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
449 GamelogTestMode(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
450 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
451 if (IsSavegameVersionBefore(98)) GamelogGRFAddList(_grfconfig); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
452 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
453 if (IsSavegameVersionBefore(119)) { |
11852
862dd1024fe7
(svn r16242) -Codechange: rework pausing
rubidium <rubidium@openttd.org>
parents:
11657
diff
changeset
|
454 _pause_mode = (_pause_mode == 2) ? PM_PAUSED_NORMAL : PM_UNPAUSED; |
13178
ec4dc42ad747
(svn r17685) -Fix: autounpausing kept trying to unpause a loaded game that was paused due to an error. Just reject such savegames in dedicated servers.
rubidium <rubidium@openttd.org>
parents:
13079
diff
changeset
|
455 } else if (_network_dedicated && (_pause_mode & PM_PAUSED_ERROR) != 0) { |
ec4dc42ad747
(svn r17685) -Fix: autounpausing kept trying to unpause a loaded game that was paused due to an error. Just reject such savegames in dedicated servers.
rubidium <rubidium@openttd.org>
parents:
13079
diff
changeset
|
456 DEBUG(net, 0, "The loading savegame was paused due to an error state."); |
ec4dc42ad747
(svn r17685) -Fix: autounpausing kept trying to unpause a loaded game that was paused due to an error. Just reject such savegames in dedicated servers.
rubidium <rubidium@openttd.org>
parents:
13079
diff
changeset
|
457 DEBUG(net, 0, " The savegame cannot be used for multiplayer!"); |
ec4dc42ad747
(svn r17685) -Fix: autounpausing kept trying to unpause a loaded game that was paused due to an error. Just reject such savegames in dedicated servers.
rubidium <rubidium@openttd.org>
parents:
13079
diff
changeset
|
458 /* Restore the signals */ |
ec4dc42ad747
(svn r17685) -Fix: autounpausing kept trying to unpause a loaded game that was paused due to an error. Just reject such savegames in dedicated servers.
rubidium <rubidium@openttd.org>
parents:
13079
diff
changeset
|
459 ResetSignalHandlers(); |
ec4dc42ad747
(svn r17685) -Fix: autounpausing kept trying to unpause a loaded game that was paused due to an error. Just reject such savegames in dedicated servers.
rubidium <rubidium@openttd.org>
parents:
13079
diff
changeset
|
460 return false; |
13617
7d3438d227a4
(svn r18141) -Fix (r18051): one couldn't (easily) continue a game in single player that was 'not enough players'/'waiting on join'-paused
rubidium <rubidium@openttd.org>
parents:
13370
diff
changeset
|
461 } else if (!_networking || _network_server) { |
7d3438d227a4
(svn r18141) -Fix (r18051): one couldn't (easily) continue a game in single player that was 'not enough players'/'waiting on join'-paused
rubidium <rubidium@openttd.org>
parents:
13370
diff
changeset
|
462 /* If we are in single player, i.e. not networking, and loading the |
7d3438d227a4
(svn r18141) -Fix (r18051): one couldn't (easily) continue a game in single player that was 'not enough players'/'waiting on join'-paused
rubidium <rubidium@openttd.org>
parents:
13370
diff
changeset
|
463 * savegame or we are loading the savegame as network server we do |
7d3438d227a4
(svn r18141) -Fix (r18051): one couldn't (easily) continue a game in single player that was 'not enough players'/'waiting on join'-paused
rubidium <rubidium@openttd.org>
parents:
13370
diff
changeset
|
464 * not want to be bothered by being paused because of the automatic |
7d3438d227a4
(svn r18141) -Fix (r18051): one couldn't (easily) continue a game in single player that was 'not enough players'/'waiting on join'-paused
rubidium <rubidium@openttd.org>
parents:
13370
diff
changeset
|
465 * reason of a network server, e.g. joining clients or too few |
7d3438d227a4
(svn r18141) -Fix (r18051): one couldn't (easily) continue a game in single player that was 'not enough players'/'waiting on join'-paused
rubidium <rubidium@openttd.org>
parents:
13370
diff
changeset
|
466 * active clients. Note that resetting these values for a network |
7d3438d227a4
(svn r18141) -Fix (r18051): one couldn't (easily) continue a game in single player that was 'not enough players'/'waiting on join'-paused
rubidium <rubidium@openttd.org>
parents:
13370
diff
changeset
|
467 * client are very bad because then the client is going to execute |
7d3438d227a4
(svn r18141) -Fix (r18051): one couldn't (easily) continue a game in single player that was 'not enough players'/'waiting on join'-paused
rubidium <rubidium@openttd.org>
parents:
13370
diff
changeset
|
468 * the game loop when the server is not, i.e. it desyncs. */ |
7d3438d227a4
(svn r18141) -Fix (r18051): one couldn't (easily) continue a game in single player that was 'not enough players'/'waiting on join'-paused
rubidium <rubidium@openttd.org>
parents:
13370
diff
changeset
|
469 _pause_mode &= ~PMB_PAUSED_NETWORK; |
11852
862dd1024fe7
(svn r16242) -Codechange: rework pausing
rubidium <rubidium@openttd.org>
parents:
11657
diff
changeset
|
470 } |
862dd1024fe7
(svn r16242) -Codechange: rework pausing
rubidium <rubidium@openttd.org>
parents:
11657
diff
changeset
|
471 |
17049
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
472 /* In very old versions, size of train stations was stored differently. |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
473 * They had swapped width and height if station was built along the Y axis. |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
474 * TTO and TTD used 3 bits for width/height, while OpenTTD used 4. |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
475 * Because the data stored by TTDPatch are unusable for rail stations > 7x7, |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
476 * recompute the width and height. Doing this unconditionally for all old |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
477 * savegames simplifies the code. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
478 if (IsSavegameVersionBefore(2)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
479 Station *st; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
480 FOR_ALL_STATIONS(st) { |
17049
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
481 st->train_station.w = st->train_station.h = 0; |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
482 } |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
483 for (TileIndex t = 0; t < map_size; t++) { |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
484 if (!IsTileType(t, MP_STATION)) continue; |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
485 if (_m[t].m5 > 7) continue; // is it a rail station tile? |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
486 st = Station::Get(_m[t].m2); |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
487 assert(st->train_station.tile != 0); |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
488 int dx = TileX(t) - TileX(st->train_station.tile); |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
489 int dy = TileY(t) - TileY(st->train_station.tile); |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
490 assert(dx >= 0 && dy >= 0); |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
491 st->train_station.w = max<uint>(st->train_station.w, dx + 1); |
fbd7cc9a81ab
(svn r21786) -Fix [FS#4398]: don't trust rail station width and height data stored by TTDPatch, it is invalid for stations wider or higher than 7
smatz <smatz@openttd.org>
parents:
16992
diff
changeset
|
492 st->train_station.h = max<uint>(st->train_station.h, dy + 1); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
493 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
494 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
495 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
496 /* in version 2.1 of the savegame, town owner was unified. */ |
16554
8db002e3e2d1
(svn r21282) -Codechange: Rename CheckSavegameVersionOldStyle() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16537
diff
changeset
|
497 if (IsSavegameVersionBefore(2, 1)) ConvertTownOwner(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
498 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
499 /* from version 4.1 of the savegame, exclusive rights are stored at towns */ |
16554
8db002e3e2d1
(svn r21282) -Codechange: Rename CheckSavegameVersionOldStyle() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16537
diff
changeset
|
500 if (IsSavegameVersionBefore(4, 1)) UpdateExclusiveRights(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
501 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
502 /* from version 4.2 of the savegame, currencies are in a different order */ |
16554
8db002e3e2d1
(svn r21282) -Codechange: Rename CheckSavegameVersionOldStyle() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16537
diff
changeset
|
503 if (IsSavegameVersionBefore(4, 2)) UpdateCurrencies(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
504 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
505 /* In old version there seems to be a problem that water is owned by |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
506 * OWNER_NONE, not OWNER_WATER.. I can't replicate it for the current |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
507 * (4.3) version, so I just check when versions are older, and then |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
508 * walk through the whole map.. */ |
16554
8db002e3e2d1
(svn r21282) -Codechange: Rename CheckSavegameVersionOldStyle() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16537
diff
changeset
|
509 if (IsSavegameVersionBefore(4, 3)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
510 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
511 if (IsTileType(t, MP_WATER) && GetTileOwner(t) >= MAX_COMPANIES) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
512 SetTileOwner(t, OWNER_WATER); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
513 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
514 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
515 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
516 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
517 if (IsSavegameVersionBefore(84)) { |
15370
a7ff8375c2c4
(svn r20013) -Fix [FS#3890]: silence some warnings / take the advice of the warnings into account
rubidium <rubidium@openttd.org>
parents:
15362
diff
changeset
|
518 Company *c; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
519 FOR_ALL_COMPANIES(c) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
520 c->name = CopyFromOldName(c->name_1); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
521 if (c->name != NULL) c->name_1 = STR_SV_UNNAMED; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
522 c->president_name = CopyFromOldName(c->president_name_1); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
523 if (c->president_name != NULL) c->president_name_1 = SPECSTR_PRESIDENT_NAME; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
524 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
525 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
526 Station *st; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
527 FOR_ALL_STATIONS(st) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
528 st->name = CopyFromOldName(st->string_id); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
529 /* generating new name would be too much work for little effect, use the station name fallback */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
530 if (st->name != NULL) st->string_id = STR_SV_STNAME_FALLBACK; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
531 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
532 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
533 Town *t; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
534 FOR_ALL_TOWNS(t) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
535 t->name = CopyFromOldName(t->townnametype); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
536 if (t->name != NULL) t->townnametype = SPECSTR_TOWNNAME_START + _settings_game.game_creation.town_name; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
537 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
538 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
539 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
540 /* From this point the old names array is cleared. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
541 ResetOldNames(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
542 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
543 if (IsSavegameVersionBefore(106)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
544 /* no station is determined by 'tile == INVALID_TILE' now (instead of '0') */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
545 Station *st; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
546 FOR_ALL_STATIONS(st) { |
14621
562ed276a7d0
(svn r19198) -Codechange: store the size of stations in savegames
yexo <yexo@openttd.org>
parents:
14357
diff
changeset
|
547 if (st->airport.tile == 0) st->airport.tile = INVALID_TILE; |
12510
3e976121ced2
(svn r16947) -Codechange: use TileArea instead of train_tile, trainst_w and trainst_h.
rubidium <rubidium@openttd.org>
parents:
12502
diff
changeset
|
548 if (st->dock_tile == 0) st->dock_tile = INVALID_TILE; |
3e976121ced2
(svn r16947) -Codechange: use TileArea instead of train_tile, trainst_w and trainst_h.
rubidium <rubidium@openttd.org>
parents:
12502
diff
changeset
|
549 if (st->train_station.tile == 0) st->train_station.tile = INVALID_TILE; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
550 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
551 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
552 /* the same applies to Company::location_of_HQ */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
553 Company *c; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
554 FOR_ALL_COMPANIES(c) { |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
555 if (c->location_of_HQ == 0 || (IsSavegameVersionBefore(4) && c->location_of_HQ == 0xFFFF)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
556 c->location_of_HQ = INVALID_TILE; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
557 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
558 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
559 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
560 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
561 /* convert road side to my format. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
562 if (_settings_game.vehicle.road_side) _settings_game.vehicle.road_side = 1; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
563 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
564 /* Check if all NewGRFs are present, we are very strict in MP mode */ |
15330
839bc68a738c
(svn r19971) -Codechange: Make IsGoodGRFConfigList() operate on any given GRFConfig and move the GameLog operations directly to AfterLoad().
frosch <frosch@openttd.org>
parents:
15292
diff
changeset
|
565 GRFListCompatibility gcf_res = IsGoodGRFConfigList(_grfconfig); |
839bc68a738c
(svn r19971) -Codechange: Make IsGoodGRFConfigList() operate on any given GRFConfig and move the GameLog operations directly to AfterLoad().
frosch <frosch@openttd.org>
parents:
15292
diff
changeset
|
566 for (GRFConfig *c = _grfconfig; c != NULL; c = c->next) { |
839bc68a738c
(svn r19971) -Codechange: Make IsGoodGRFConfigList() operate on any given GRFConfig and move the GameLog operations directly to AfterLoad().
frosch <frosch@openttd.org>
parents:
15292
diff
changeset
|
567 if (c->status == GCS_NOT_FOUND) { |
839bc68a738c
(svn r19971) -Codechange: Make IsGoodGRFConfigList() operate on any given GRFConfig and move the GameLog operations directly to AfterLoad().
frosch <frosch@openttd.org>
parents:
15292
diff
changeset
|
568 GamelogGRFRemove(c->ident.grfid); |
839bc68a738c
(svn r19971) -Codechange: Make IsGoodGRFConfigList() operate on any given GRFConfig and move the GameLog operations directly to AfterLoad().
frosch <frosch@openttd.org>
parents:
15292
diff
changeset
|
569 } else if (HasBit(c->flags, GCF_COMPATIBLE)) { |
839bc68a738c
(svn r19971) -Codechange: Make IsGoodGRFConfigList() operate on any given GRFConfig and move the GameLog operations directly to AfterLoad().
frosch <frosch@openttd.org>
parents:
15292
diff
changeset
|
570 GamelogGRFCompatible(&c->ident); |
839bc68a738c
(svn r19971) -Codechange: Make IsGoodGRFConfigList() operate on any given GRFConfig and move the GameLog operations directly to AfterLoad().
frosch <frosch@openttd.org>
parents:
15292
diff
changeset
|
571 } |
839bc68a738c
(svn r19971) -Codechange: Make IsGoodGRFConfigList() operate on any given GRFConfig and move the GameLog operations directly to AfterLoad().
frosch <frosch@openttd.org>
parents:
15292
diff
changeset
|
572 } |
839bc68a738c
(svn r19971) -Codechange: Make IsGoodGRFConfigList() operate on any given GRFConfig and move the GameLog operations directly to AfterLoad().
frosch <frosch@openttd.org>
parents:
15292
diff
changeset
|
573 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
574 if (_networking && gcf_res != GLC_ALL_GOOD) { |
12632
e41943276802
(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives
rubidium <rubidium@openttd.org>
parents:
12555
diff
changeset
|
575 SetSaveLoadError(STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
576 /* Restore the signals */ |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
577 ResetSignalHandlers(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
578 return false; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
579 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
580 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
581 switch (gcf_res) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
582 case GLC_COMPATIBLE: _switch_mode_errorstr = STR_NEWGRF_COMPATIBLE_LOAD_WARNING; break; |
11852
862dd1024fe7
(svn r16242) -Codechange: rework pausing
rubidium <rubidium@openttd.org>
parents:
11657
diff
changeset
|
583 case GLC_NOT_FOUND: _switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; _pause_mode = PM_PAUSED_ERROR; break; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
584 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
585 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
586 |
15908
434567b681a8
(svn r20592) -Fix (r2041): no (proper) savegame conversion was done when _date_fract got a new value range
rubidium <rubidium@openttd.org>
parents:
15907
diff
changeset
|
587 /* The value of _date_fract got divided, so make sure that old games are converted correctly. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
588 if (IsSavegameVersionBefore(11, 1) || (IsSavegameVersionBefore(147) && _date_fract > DAY_TICKS)) _date_fract /= 885; |
15908
434567b681a8
(svn r20592) -Fix (r2041): no (proper) savegame conversion was done when _date_fract got a new value range
rubidium <rubidium@openttd.org>
parents:
15907
diff
changeset
|
589 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
590 /* Update current year |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
591 * must be done before loading sprites as some newgrfs check it */ |
15907
33fed3e36d65
(svn r20591) -Codechange: make sure _date_fract is set when SetDate is called. Some places wouldn't reset _date_fract correctly at all
rubidium <rubidium@openttd.org>
parents:
15846
diff
changeset
|
592 SetDate(_date, _date_fract); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
593 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
594 /* Force dynamic engines off when loading older savegames */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
595 if (IsSavegameVersionBefore(95)) _settings_game.vehicle.dynamic_engines = 0; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
596 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
597 /* Load the sprites */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
598 GfxLoadSprites(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
599 LoadStringWidthTable(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
600 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
601 /* Copy temporary data to Engine pool */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
602 CopyTempEngineData(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
603 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
604 /* Connect front and rear engines of multiheaded trains and converts |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
605 * subtype to the new format */ |
16554
8db002e3e2d1
(svn r21282) -Codechange: Rename CheckSavegameVersionOldStyle() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16537
diff
changeset
|
606 if (IsSavegameVersionBefore(17, 1)) ConvertOldMultiheadToNew(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
607 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
608 /* Connect front and rear engines of multiheaded trains */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
609 ConnectMultiheadedTrains(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
610 |
13307
d998ec8f4d78
(svn r17816) -Codechange: move the CargoList invalidation-after-saveload to the function that handles the CargoPackets instead of spreading it around over the saveload files. Also add some code to validate whether the caches are valid; to be removed later when no problems turn up
rubidium <rubidium@openttd.org>
parents:
13297
diff
changeset
|
611 /* Fix the CargoPackets *and* fix the caches of CargoLists. |
d998ec8f4d78
(svn r17816) -Codechange: move the CargoList invalidation-after-saveload to the function that handles the CargoPackets instead of spreading it around over the saveload files. Also add some code to validate whether the caches are valid; to be removed later when no problems turn up
rubidium <rubidium@openttd.org>
parents:
13297
diff
changeset
|
612 * If this isn't done before Stations and especially Vehicles are |
d998ec8f4d78
(svn r17816) -Codechange: move the CargoList invalidation-after-saveload to the function that handles the CargoPackets instead of spreading it around over the saveload files. Also add some code to validate whether the caches are valid; to be removed later when no problems turn up
rubidium <rubidium@openttd.org>
parents:
13297
diff
changeset
|
613 * running their AfterLoad we might get in trouble. In the case of |
d998ec8f4d78
(svn r17816) -Codechange: move the CargoList invalidation-after-saveload to the function that handles the CargoPackets instead of spreading it around over the saveload files. Also add some code to validate whether the caches are valid; to be removed later when no problems turn up
rubidium <rubidium@openttd.org>
parents:
13297
diff
changeset
|
614 * vehicles we could give the wrong (cached) count of items in a |
d998ec8f4d78
(svn r17816) -Codechange: move the CargoList invalidation-after-saveload to the function that handles the CargoPackets instead of spreading it around over the saveload files. Also add some code to validate whether the caches are valid; to be removed later when no problems turn up
rubidium <rubidium@openttd.org>
parents:
13297
diff
changeset
|
615 * vehicle which causes different results when getting their caches |
d998ec8f4d78
(svn r17816) -Codechange: move the CargoList invalidation-after-saveload to the function that handles the CargoPackets instead of spreading it around over the saveload files. Also add some code to validate whether the caches are valid; to be removed later when no problems turn up
rubidium <rubidium@openttd.org>
parents:
13297
diff
changeset
|
616 * filled; and that could eventually lead to desyncs. */ |
d998ec8f4d78
(svn r17816) -Codechange: move the CargoList invalidation-after-saveload to the function that handles the CargoPackets instead of spreading it around over the saveload files. Also add some code to validate whether the caches are valid; to be removed later when no problems turn up
rubidium <rubidium@openttd.org>
parents:
13297
diff
changeset
|
617 CargoPacket::AfterLoad(); |
d998ec8f4d78
(svn r17816) -Codechange: move the CargoList invalidation-after-saveload to the function that handles the CargoPackets instead of spreading it around over the saveload files. Also add some code to validate whether the caches are valid; to be removed later when no problems turn up
rubidium <rubidium@openttd.org>
parents:
13297
diff
changeset
|
618 |
14791
718e326efa23
(svn r19380) -Fix [FS#3678] (r19322): updating the id of the oilrig airport should be done earlier as it can be used by newgrf code
yexo <yexo@openttd.org>
parents:
14753
diff
changeset
|
619 /* Oilrig was moved from id 15 to 9. We have to do this conversion |
718e326efa23
(svn r19380) -Fix [FS#3678] (r19322): updating the id of the oilrig airport should be done earlier as it can be used by newgrf code
yexo <yexo@openttd.org>
parents:
14753
diff
changeset
|
620 * here as AfterLoadVehicles can check it indirectly via the newgrf |
718e326efa23
(svn r19380) -Fix [FS#3678] (r19322): updating the id of the oilrig airport should be done earlier as it can be used by newgrf code
yexo <yexo@openttd.org>
parents:
14753
diff
changeset
|
621 * code. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
622 if (IsSavegameVersionBefore(139)) { |
14791
718e326efa23
(svn r19380) -Fix [FS#3678] (r19322): updating the id of the oilrig airport should be done earlier as it can be used by newgrf code
yexo <yexo@openttd.org>
parents:
14753
diff
changeset
|
623 Station *st; |
718e326efa23
(svn r19380) -Fix [FS#3678] (r19322): updating the id of the oilrig airport should be done earlier as it can be used by newgrf code
yexo <yexo@openttd.org>
parents:
14753
diff
changeset
|
624 FOR_ALL_STATIONS(st) { |
14859
304d377a82af
(svn r19455) -Codechange: split all airport information in Station to a seperate class
yexo <yexo@openttd.org>
parents:
14805
diff
changeset
|
625 if (st->airport.tile != INVALID_TILE && st->airport.type == 15) { |
304d377a82af
(svn r19455) -Codechange: split all airport information in Station to a seperate class
yexo <yexo@openttd.org>
parents:
14805
diff
changeset
|
626 st->airport.type = AT_OILRIG; |
14791
718e326efa23
(svn r19380) -Fix [FS#3678] (r19322): updating the id of the oilrig airport should be done earlier as it can be used by newgrf code
yexo <yexo@openttd.org>
parents:
14753
diff
changeset
|
627 } |
718e326efa23
(svn r19380) -Fix [FS#3678] (r19322): updating the id of the oilrig airport should be done earlier as it can be used by newgrf code
yexo <yexo@openttd.org>
parents:
14753
diff
changeset
|
628 } |
718e326efa23
(svn r19380) -Fix [FS#3678] (r19322): updating the id of the oilrig airport should be done earlier as it can be used by newgrf code
yexo <yexo@openttd.org>
parents:
14753
diff
changeset
|
629 } |
718e326efa23
(svn r19380) -Fix [FS#3678] (r19322): updating the id of the oilrig airport should be done earlier as it can be used by newgrf code
yexo <yexo@openttd.org>
parents:
14753
diff
changeset
|
630 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
631 /* Update all vehicles */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
632 AfterLoadVehicles(true); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
633 |
10696
7edccbb67398
(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
truebrain <truebrain@openttd.org>
parents:
10647
diff
changeset
|
634 /* Make sure there is an AI attached to an AI company */ |
7edccbb67398
(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
truebrain <truebrain@openttd.org>
parents:
10647
diff
changeset
|
635 { |
7edccbb67398
(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
truebrain <truebrain@openttd.org>
parents:
10647
diff
changeset
|
636 Company *c; |
7edccbb67398
(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
truebrain <truebrain@openttd.org>
parents:
10647
diff
changeset
|
637 FOR_ALL_COMPANIES(c) { |
7edccbb67398
(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
truebrain <truebrain@openttd.org>
parents:
10647
diff
changeset
|
638 if (c->is_ai && c->ai_instance == NULL) AI::StartNew(c->index); |
7edccbb67398
(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
truebrain <truebrain@openttd.org>
parents:
10647
diff
changeset
|
639 } |
7edccbb67398
(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
truebrain <truebrain@openttd.org>
parents:
10647
diff
changeset
|
640 } |
7edccbb67398
(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.
truebrain <truebrain@openttd.org>
parents:
10647
diff
changeset
|
641 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
642 /* make sure there is a town in the game */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
643 if (_game_mode == GM_NORMAL && !ClosestTownFromTile(0, UINT_MAX)) { |
12632
e41943276802
(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives
rubidium <rubidium@openttd.org>
parents:
12555
diff
changeset
|
644 SetSaveLoadError(STR_ERROR_NO_TOWN_IN_SCENARIO); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
645 /* Restore the signals */ |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
646 ResetSignalHandlers(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
647 return false; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
648 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
649 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
650 /* The void tiles on the southern border used to belong to a wrong class (pre 4.3). |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
651 * This problem appears in savegame version 21 too, see r3455. But after loading the |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
652 * savegame and saving again, the buggy map array could be converted to new savegame |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
653 * version. It didn't show up before r12070. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
654 if (IsSavegameVersionBefore(87)) UpdateVoidTiles(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
655 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
656 /* If Load Scenario / New (Scenario) Game is used, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
657 * a company does not exist yet. So create one here. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
658 * 1 exeption: network-games. Those can have 0 companies |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
659 * But this exeption is not true for non dedicated network_servers! */ |
15552
683f2dbe75bb
(svn r20211) -Codechange: Indented code should have curly braces around it.
alberth <alberth@openttd.org>
parents:
15511
diff
changeset
|
660 if (!Company::IsValidID(COMPANY_FIRST) && (!_networking || (_networking && _network_server && !_network_dedicated))) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
661 DoStartupNewCompany(false); |
15552
683f2dbe75bb
(svn r20211) -Codechange: Indented code should have curly braces around it.
alberth <alberth@openttd.org>
parents:
15511
diff
changeset
|
662 } |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
663 |
12279
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
664 /* Fix the cache for cargo payments. */ |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
665 CargoPayment *cp; |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
666 FOR_ALL_CARGO_PAYMENTS(cp) { |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
667 cp->front->cargo_payment = cp; |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
668 cp->current_station = cp->front->last_station_visited; |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
669 } |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
670 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
671 if (IsSavegameVersionBefore(72)) { |
15089
e0fd48f3f61b
(svn r19715) -Codechange: Rename all appareances of shiplift to lock.
terkhen <terkhen@openttd.org>
parents:
14859
diff
changeset
|
672 /* Locks in very old savegames had OWNER_WATER as owner */ |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
673 for (TileIndex t = 0; t < MapSize(); t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
674 switch (GetTileType(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
675 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
676 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
677 case MP_WATER: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
678 if (GetWaterTileType(t) == WATER_TILE_LOCK && GetTileOwner(t) == OWNER_WATER) SetTileOwner(t, OWNER_NONE); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
679 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
680 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
681 case MP_STATION: { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
682 if (HasBit(_m[t].m6, 3)) SetBit(_m[t].m6, 2); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
683 StationGfx gfx = GetStationGfx(t); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
684 StationType st; |
12502
9472b49c61a1
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
rubidium <rubidium@openttd.org>
parents:
12501
diff
changeset
|
685 if ( IsInsideMM(gfx, 0, 8)) { // Rail station |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
686 st = STATION_RAIL; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
687 SetStationGfx(t, gfx - 0); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
688 } else if (IsInsideMM(gfx, 8, 67)) { // Airport |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
689 st = STATION_AIRPORT; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
690 SetStationGfx(t, gfx - 8); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
691 } else if (IsInsideMM(gfx, 67, 71)) { // Truck |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
692 st = STATION_TRUCK; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
693 SetStationGfx(t, gfx - 67); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
694 } else if (IsInsideMM(gfx, 71, 75)) { // Bus |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
695 st = STATION_BUS; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
696 SetStationGfx(t, gfx - 71); |
12502
9472b49c61a1
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
rubidium <rubidium@openttd.org>
parents:
12501
diff
changeset
|
697 } else if (gfx == 75) { // Oil rig |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
698 st = STATION_OILRIG; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
699 SetStationGfx(t, gfx - 75); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
700 } else if (IsInsideMM(gfx, 76, 82)) { // Dock |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
701 st = STATION_DOCK; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
702 SetStationGfx(t, gfx - 76); |
12502
9472b49c61a1
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
rubidium <rubidium@openttd.org>
parents:
12501
diff
changeset
|
703 } else if (gfx == 82) { // Buoy |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
704 st = STATION_BUOY; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
705 SetStationGfx(t, gfx - 82); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
706 } else if (IsInsideMM(gfx, 83, 168)) { // Extended airport |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
707 st = STATION_AIRPORT; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
708 SetStationGfx(t, gfx - 83 + 67 - 8); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
709 } else if (IsInsideMM(gfx, 168, 170)) { // Drive through truck |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
710 st = STATION_TRUCK; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
711 SetStationGfx(t, gfx - 168 + GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
712 } else if (IsInsideMM(gfx, 170, 172)) { // Drive through bus |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
713 st = STATION_BUS; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
714 SetStationGfx(t, gfx - 170 + GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
715 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
716 /* Restore the signals */ |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
717 ResetSignalHandlers(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
718 return false; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
719 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
720 SB(_m[t].m6, 3, 3, st); |
15618
e4640748f223
(svn r20281) -Codechange: unify case scope closure + break coding style
rubidium <rubidium@openttd.org>
parents:
15579
diff
changeset
|
721 break; |
e4640748f223
(svn r20281) -Codechange: unify case scope closure + break coding style
rubidium <rubidium@openttd.org>
parents:
15579
diff
changeset
|
722 } |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
723 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
724 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
725 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
726 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
727 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
728 switch (GetTileType(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
729 case MP_STATION: { |
12525
6ff0b71dee93
(svn r16962) -Codechange: more work towards multi tile waypoints
rubidium <rubidium@openttd.org>
parents:
12510
diff
changeset
|
730 BaseStation *bst = BaseStation::GetByTile(t); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
731 |
12525
6ff0b71dee93
(svn r16962) -Codechange: more work towards multi tile waypoints
rubidium <rubidium@openttd.org>
parents:
12510
diff
changeset
|
732 /* Set up station spread */ |
6ff0b71dee93
(svn r16962) -Codechange: more work towards multi tile waypoints
rubidium <rubidium@openttd.org>
parents:
12510
diff
changeset
|
733 bst->rect.BeforeAddTile(t, StationRect::ADD_FORCE); |
6ff0b71dee93
(svn r16962) -Codechange: more work towards multi tile waypoints
rubidium <rubidium@openttd.org>
parents:
12510
diff
changeset
|
734 |
6ff0b71dee93
(svn r16962) -Codechange: more work towards multi tile waypoints
rubidium <rubidium@openttd.org>
parents:
12510
diff
changeset
|
735 /* Waypoints don't have road stops/oil rigs in the old format */ |
6ff0b71dee93
(svn r16962) -Codechange: more work towards multi tile waypoints
rubidium <rubidium@openttd.org>
parents:
12510
diff
changeset
|
736 if (!Station::IsExpected(bst)) break; |
6ff0b71dee93
(svn r16962) -Codechange: more work towards multi tile waypoints
rubidium <rubidium@openttd.org>
parents:
12510
diff
changeset
|
737 Station *st = Station::From(bst); |
12479
7d22a958384f
(svn r16916) -Fix (r16909): station acceptance was reset after game load
smatz <smatz@openttd.org>
parents:
12472
diff
changeset
|
738 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
739 switch (GetStationType(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
740 case STATION_TRUCK: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
741 case STATION_BUS: |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
742 if (IsSavegameVersionBefore(6)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
743 /* From this version on there can be multiple road stops of the |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
744 * same type per station. Convert the existing stops to the new |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
745 * internal data structure. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
746 RoadStop *rs = new RoadStop(t); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
747 if (rs == NULL) error("Too many road stops in savegame"); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
748 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
749 RoadStop **head = |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
750 IsTruckStop(t) ? &st->truck_stops : &st->bus_stops; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
751 *head = rs; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
752 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
753 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
754 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
755 case STATION_OILRIG: { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
756 /* Very old savegames sometimes have phantom oil rigs, i.e. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
757 * an oil rig which got shut down, but not completly removed from |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
758 * the map |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
759 */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
760 TileIndex t1 = TILE_ADDXY(t, 0, 1); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
761 if (IsTileType(t1, MP_INDUSTRY) && |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
762 GetIndustryGfx(t1) == GFX_OILRIG_1) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
763 /* The internal encoding of oil rigs was changed twice. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
764 * It was 3 (till 2.2) and later 5 (till 5.1). |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
765 * Setting it unconditionally does not hurt. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
766 */ |
14859
304d377a82af
(svn r19455) -Codechange: split all airport information in Station to a seperate class
yexo <yexo@openttd.org>
parents:
14805
diff
changeset
|
767 Station::GetByTile(t)->airport.type = AT_OILRIG; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
768 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
769 DeleteOilRig(t); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
770 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
771 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
772 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
773 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
774 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
775 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
776 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
777 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
778 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
779 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
780 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
781 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
782 |
10845
0429d269cb59
(svn r15180) -Fix [FS#2560](r8498): old aircraft have to be updated after updating airport_type of oil rigs
smatz <smatz@openttd.org>
parents:
10844
diff
changeset
|
783 /* In version 2.2 of the savegame, we have new airports, so status of all aircraft is reset. |
0429d269cb59
(svn r15180) -Fix [FS#2560](r8498): old aircraft have to be updated after updating airport_type of oil rigs
smatz <smatz@openttd.org>
parents:
10844
diff
changeset
|
784 * This has to be called after the oilrig airport_type update above ^^^ ! */ |
16554
8db002e3e2d1
(svn r21282) -Codechange: Rename CheckSavegameVersionOldStyle() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16537
diff
changeset
|
785 if (IsSavegameVersionBefore(2, 2)) UpdateOldAircraft(); |
10845
0429d269cb59
(svn r15180) -Fix [FS#2560](r8498): old aircraft have to be updated after updating airport_type of oil rigs
smatz <smatz@openttd.org>
parents:
10844
diff
changeset
|
786 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
787 /* In version 6.1 we put the town index in the map-array. To do this, we need |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
788 * to use m2 (16bit big), so we need to clean m2, and that is where this is |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
789 * all about ;) */ |
16554
8db002e3e2d1
(svn r21282) -Codechange: Rename CheckSavegameVersionOldStyle() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16537
diff
changeset
|
790 if (IsSavegameVersionBefore(6, 1)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
791 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
792 switch (GetTileType(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
793 case MP_HOUSE: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
794 _m[t].m4 = _m[t].m2; |
11293
49968fa7d5e4
(svn r15642) -Codechange: use a default parameter value in CalcClosestTownFromTile
smatz <smatz@openttd.org>
parents:
11252
diff
changeset
|
795 SetTownIndex(t, CalcClosestTownFromTile(t)->index); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
796 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
797 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
798 case MP_ROAD: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
799 _m[t].m4 |= (_m[t].m2 << 4); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
800 if ((GB(_m[t].m5, 4, 2) == ROAD_TILE_CROSSING ? (Owner)_m[t].m3 : GetTileOwner(t)) == OWNER_TOWN) { |
11293
49968fa7d5e4
(svn r15642) -Codechange: use a default parameter value in CalcClosestTownFromTile
smatz <smatz@openttd.org>
parents:
11252
diff
changeset
|
801 SetTownIndex(t, CalcClosestTownFromTile(t)->index); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
802 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
803 SetTownIndex(t, 0); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
804 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
805 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
806 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
807 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
808 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
809 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
810 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
811 |
10855
7881d9cd55ab
(svn r15190) -Feature: Allow terraforming of the tiles at the edges of the map.
Yexo <Yexo@openttd.org>
parents:
10848
diff
changeset
|
812 /* Force the freeform edges to false for old savegames. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
813 if (IsSavegameVersionBefore(111)) { |
10855
7881d9cd55ab
(svn r15190) -Feature: Allow terraforming of the tiles at the edges of the map.
Yexo <Yexo@openttd.org>
parents:
10848
diff
changeset
|
814 _settings_game.construction.freeform_edges = false; |
7881d9cd55ab
(svn r15190) -Feature: Allow terraforming of the tiles at the edges of the map.
Yexo <Yexo@openttd.org>
parents:
10848
diff
changeset
|
815 } |
7881d9cd55ab
(svn r15190) -Feature: Allow terraforming of the tiles at the edges of the map.
Yexo <Yexo@openttd.org>
parents:
10848
diff
changeset
|
816 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
817 /* From version 9.0, we update the max passengers of a town (was sometimes negative |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
818 * before that. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
819 if (IsSavegameVersionBefore(9)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
820 Town *t; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
821 FOR_ALL_TOWNS(t) UpdateTownMaxPass(t); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
822 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
823 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
824 /* From version 16.0, we included autorenew on engines, which are now saved, but |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
825 * of course, we do need to initialize them for older savegames. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
826 if (IsSavegameVersionBefore(16)) { |
15370
a7ff8375c2c4
(svn r20013) -Fix [FS#3890]: silence some warnings / take the advice of the warnings into account
rubidium <rubidium@openttd.org>
parents:
15362
diff
changeset
|
827 Company *c; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
828 FOR_ALL_COMPANIES(c) { |
11913
f67b6243e05a
(svn r16315) -Codechange: move the autorenew settings to a new CompanySettings struct
yexo <yexo@openttd.org>
parents:
11852
diff
changeset
|
829 c->engine_renew_list = NULL; |
f67b6243e05a
(svn r16315) -Codechange: move the autorenew settings to a new CompanySettings struct
yexo <yexo@openttd.org>
parents:
11852
diff
changeset
|
830 c->settings.engine_renew = false; |
f67b6243e05a
(svn r16315) -Codechange: move the autorenew settings to a new CompanySettings struct
yexo <yexo@openttd.org>
parents:
11852
diff
changeset
|
831 c->settings.engine_renew_months = 6; |
f67b6243e05a
(svn r16315) -Codechange: move the autorenew settings to a new CompanySettings struct
yexo <yexo@openttd.org>
parents:
11852
diff
changeset
|
832 c->settings.engine_renew_money = 100000; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
833 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
834 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
835 /* When loading a game, _local_company is not yet set to the correct value. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
836 * However, in a dedicated server we are a spectator, so nothing needs to |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
837 * happen. In case we are not a dedicated server, the local company always |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
838 * becomes company 0, unless we are in the scenario editor where all the |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
839 * companies are 'invalid'. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
840 */ |
11949
c89301974eb8
(svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get()
smatz <smatz@openttd.org>
parents:
11948
diff
changeset
|
841 c = Company::GetIfValid(COMPANY_FIRST); |
c89301974eb8
(svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get()
smatz <smatz@openttd.org>
parents:
11948
diff
changeset
|
842 if (!_network_dedicated && c != NULL) { |
11913
f67b6243e05a
(svn r16315) -Codechange: move the autorenew settings to a new CompanySettings struct
yexo <yexo@openttd.org>
parents:
11852
diff
changeset
|
843 c->settings = _settings_client.company; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
844 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
845 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
846 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
847 if (IsSavegameVersionBefore(48)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
848 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
849 switch (GetTileType(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
850 case MP_RAILWAY: |
11946
d5716f5a9844
(svn r16349) -Codechange: rename IsPlainRailTile() to IsPlainRail(), introduce shiny new IsPlainRailTile()
smatz <smatz@openttd.org>
parents:
11924
diff
changeset
|
851 if (IsPlainRail(t)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
852 /* Swap ground type and signal type for plain rail tiles, so the |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
853 * ground type uses the same bits as for depots and waypoints. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
854 uint tmp = GB(_m[t].m4, 0, 4); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
855 SB(_m[t].m4, 0, 4, GB(_m[t].m2, 0, 4)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
856 SB(_m[t].m2, 0, 4, tmp); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
857 } else if (HasBit(_m[t].m5, 2)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
858 /* Split waypoint and depot rail type and remove the subtype. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
859 ClrBit(_m[t].m5, 2); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
860 ClrBit(_m[t].m5, 6); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
861 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
862 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
863 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
864 case MP_ROAD: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
865 /* Swap m3 and m4, so the track type for rail crossings is the |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
866 * same as for normal rail. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
867 Swap(_m[t].m3, _m[t].m4); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
868 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
869 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
870 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
871 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
872 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
873 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
874 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
875 if (IsSavegameVersionBefore(61)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
876 /* Added the RoadType */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
877 bool old_bridge = IsSavegameVersionBefore(42); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
878 for (TileIndex t = 0; t < map_size; t++) { |
11252
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
879 switch (GetTileType(t)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
880 case MP_ROAD: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
881 SB(_m[t].m5, 6, 2, GB(_m[t].m5, 4, 2)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
882 switch (GetRoadTileType(t)) { |
16123
a73c48c80b5d
(svn r20819) -Fix [FS#3714]: be a bit more "lenient" w.r.t. invalid savegames; don't crash on saveload related NOT_REACHEDs, just show the user an error that the savegame is corrupted
rubidium <rubidium@openttd.org>
parents:
16122
diff
changeset
|
883 default: SlErrorCorrupt("Invalid road tile type"); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
884 case ROAD_TILE_NORMAL: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
885 SB(_m[t].m4, 0, 4, GB(_m[t].m5, 0, 4)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
886 SB(_m[t].m4, 4, 4, 0); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
887 SB(_m[t].m6, 2, 4, 0); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
888 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
889 case ROAD_TILE_CROSSING: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
890 SB(_m[t].m4, 5, 2, GB(_m[t].m5, 2, 2)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
891 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
892 case ROAD_TILE_DEPOT: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
893 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
894 SetRoadTypes(t, ROADTYPES_ROAD); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
895 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
896 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
897 case MP_STATION: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
898 if (IsRoadStop(t)) SetRoadTypes(t, ROADTYPES_ROAD); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
899 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
900 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
901 case MP_TUNNELBRIDGE: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
902 /* Middle part of "old" bridges */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
903 if (old_bridge && IsBridge(t) && HasBit(_m[t].m5, 6)) break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
904 if (((old_bridge && IsBridge(t)) ? (TransportType)GB(_m[t].m5, 1, 2) : GetTunnelBridgeTransportType(t)) == TRANSPORT_ROAD) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
905 SetRoadTypes(t, ROADTYPES_ROAD); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
906 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
907 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
908 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
909 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
910 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
911 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
912 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
913 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
914 if (IsSavegameVersionBefore(114)) { |
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
915 bool fix_roadtypes = !IsSavegameVersionBefore(61); |
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
916 bool old_bridge = IsSavegameVersionBefore(42); |
11252
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
917 |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
918 for (TileIndex t = 0; t < map_size; t++) { |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
919 switch (GetTileType(t)) { |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
920 case MP_ROAD: |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
921 if (fix_roadtypes) SetRoadTypes(t, (RoadTypes)GB(_me[t].m7, 5, 3)); |
11368
82c90cd591ab
(svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too
rubidium <rubidium@openttd.org>
parents:
11293
diff
changeset
|
922 SB(_me[t].m7, 5, 1, GB(_m[t].m3, 7, 1)); // snow/desert |
11252
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
923 switch (GetRoadTileType(t)) { |
16123
a73c48c80b5d
(svn r20819) -Fix [FS#3714]: be a bit more "lenient" w.r.t. invalid savegames; don't crash on saveload related NOT_REACHEDs, just show the user an error that the savegame is corrupted
rubidium <rubidium@openttd.org>
parents:
16122
diff
changeset
|
924 default: SlErrorCorrupt("Invalid road tile type"); |
11252
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
925 case ROAD_TILE_NORMAL: |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
926 SB(_me[t].m7, 0, 4, GB(_m[t].m3, 0, 4)); // road works |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
927 SB(_m[t].m6, 3, 3, GB(_m[t].m3, 4, 3)); // ground |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
928 SB(_m[t].m3, 0, 4, GB(_m[t].m4, 4, 4)); // tram bits |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
929 SB(_m[t].m3, 4, 4, GB(_m[t].m5, 0, 4)); // tram owner |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
930 SB(_m[t].m5, 0, 4, GB(_m[t].m4, 0, 4)); // road bits |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
931 break; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
932 |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
933 case ROAD_TILE_CROSSING: |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
934 SB(_me[t].m7, 0, 5, GB(_m[t].m4, 0, 5)); // road owner |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
935 SB(_m[t].m6, 3, 3, GB(_m[t].m3, 4, 3)); // ground |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
936 SB(_m[t].m3, 4, 4, GB(_m[t].m5, 0, 4)); // tram owner |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
937 SB(_m[t].m5, 0, 1, GB(_m[t].m4, 6, 1)); // road axis |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
938 SB(_m[t].m5, 5, 1, GB(_m[t].m4, 5, 1)); // crossing state |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
939 break; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
940 |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
941 case ROAD_TILE_DEPOT: |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
942 break; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
943 } |
12998
c71e77a71cad
(svn r17492) -Codechange: don't store the town index for road depots.
rubidium <rubidium@openttd.org>
parents:
12946
diff
changeset
|
944 if (!IsRoadDepot(t) && !HasTownOwnedRoad(t)) { |
11293
49968fa7d5e4
(svn r15642) -Codechange: use a default parameter value in CalcClosestTownFromTile
smatz <smatz@openttd.org>
parents:
11252
diff
changeset
|
945 const Town *town = CalcClosestTownFromTile(t); |
11252
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
946 if (town != NULL) SetTownIndex(t, town->index); |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
947 } |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
948 _m[t].m4 = 0; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
949 break; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
950 |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
951 case MP_STATION: |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
952 if (!IsRoadStop(t)) break; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
953 |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
954 if (fix_roadtypes) SetRoadTypes(t, (RoadTypes)GB(_m[t].m3, 0, 3)); |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
955 SB(_me[t].m7, 0, 5, HasBit(_m[t].m6, 2) ? OWNER_TOWN : GetTileOwner(t)); |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
956 SB(_m[t].m3, 4, 4, _m[t].m1); |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
957 _m[t].m4 = 0; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
958 break; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
959 |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
960 case MP_TUNNELBRIDGE: |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
961 if (old_bridge && IsBridge(t) && HasBit(_m[t].m5, 6)) break; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
962 if (((old_bridge && IsBridge(t)) ? (TransportType)GB(_m[t].m5, 1, 2) : GetTunnelBridgeTransportType(t)) == TRANSPORT_ROAD) { |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
963 if (fix_roadtypes) SetRoadTypes(t, (RoadTypes)GB(_m[t].m3, 0, 3)); |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
964 |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
965 Owner o = GetTileOwner(t); |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
966 SB(_me[t].m7, 0, 5, o); // road owner |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
967 SB(_m[t].m3, 4, 4, o == OWNER_NONE ? OWNER_TOWN : o); // tram owner |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
968 } |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
969 SB(_m[t].m6, 2, 4, GB(_m[t].m2, 4, 4)); // bridge type |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
970 SB(_me[t].m7, 5, 1, GB(_m[t].m4, 7, 1)); // snow/desert |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
971 |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
972 _m[t].m2 = 0; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
973 _m[t].m4 = 0; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
974 break; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
975 |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
976 default: break; |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
977 } |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
978 } |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
979 } |
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
980 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
981 if (IsSavegameVersionBefore(42)) { |
10647
592ae9307430
(svn r14949) -Cleanup: pointer coding style
rubidium <rubidium@openttd.org>
parents:
10571
diff
changeset
|
982 Vehicle *v; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
983 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
984 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
985 if (MayHaveBridgeAbove(t)) ClearBridgeMiddle(t); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
986 if (IsBridgeTile(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
987 if (HasBit(_m[t].m5, 6)) { // middle part |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
988 Axis axis = (Axis)GB(_m[t].m5, 0, 1); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
989 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
990 if (HasBit(_m[t].m5, 5)) { // transport route under bridge? |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
991 if (GB(_m[t].m5, 3, 2) == TRANSPORT_RAIL) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
992 MakeRailNormal( |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
993 t, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
994 GetTileOwner(t), |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
995 axis == AXIS_X ? TRACK_BIT_Y : TRACK_BIT_X, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
996 GetRailType(t) |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
997 ); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
998 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
999 TownID town = IsTileOwner(t, OWNER_TOWN) ? ClosestTownFromTile(t, UINT_MAX)->index : 0; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1000 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1001 MakeRoadNormal( |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1002 t, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1003 axis == AXIS_X ? ROAD_Y : ROAD_X, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1004 ROADTYPES_ROAD, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1005 town, |
11252
f7b6f8f03e5e
(svn r15601) -Fix [FS#2615]: bridges/tunnels don't store tram owner making it possible to remove someone's tram tracks.
rubidium <rubidium@openttd.org>
parents:
11234
diff
changeset
|
1006 GetTileOwner(t), OWNER_NONE |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1007 ); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1008 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1009 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1010 if (GB(_m[t].m5, 3, 2) == 0) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1011 MakeClear(t, CLEAR_GRASS, 3); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1012 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1013 if (GetTileSlope(t, NULL) != SLOPE_FLAT) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1014 MakeShore(t); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1015 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1016 if (GetTileOwner(t) == OWNER_WATER) { |
13308
e44c31238b3c
(svn r17817) -Codechange: MakeWater actually made sea tiles, so rename it to MakeSea and unduplicate the code to make sea, rivers and canals.
rubidium <rubidium@openttd.org>
parents:
13307
diff
changeset
|
1017 MakeSea(t); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1018 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1019 MakeCanal(t, GetTileOwner(t), Random()); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1020 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1021 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1022 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1023 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1024 SetBridgeMiddle(t, axis); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1025 } else { // ramp |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1026 Axis axis = (Axis)GB(_m[t].m5, 0, 1); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1027 uint north_south = GB(_m[t].m5, 5, 1); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1028 DiagDirection dir = ReverseDiagDir(XYNSToDiagDir(axis, north_south)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1029 TransportType type = (TransportType)GB(_m[t].m5, 1, 2); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1030 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1031 _m[t].m5 = 1 << 7 | type << 2 | dir; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1032 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1033 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1034 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1035 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1036 FOR_ALL_VEHICLES(v) { |
16783
37b5683941fa
(svn r21516) -Codechange: Add IsGroundVehicle function to the Vehicle class.
terkhen <terkhen@openttd.org>
parents:
16771
diff
changeset
|
1037 if (!v->IsGroundVehicle()) continue; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1038 if (IsBridgeTile(v->tile)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1039 DiagDirection dir = GetTunnelBridgeDirection(v->tile); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1040 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1041 if (dir != DirToDiagDir(v->direction)) continue; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1042 switch (dir) { |
16123
a73c48c80b5d
(svn r20819) -Fix [FS#3714]: be a bit more "lenient" w.r.t. invalid savegames; don't crash on saveload related NOT_REACHEDs, just show the user an error that the savegame is corrupted
rubidium <rubidium@openttd.org>
parents:
16122
diff
changeset
|
1043 default: SlErrorCorrupt("Invalid vehicle direction"); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1044 case DIAGDIR_NE: if ((v->x_pos & 0xF) != 0) continue; break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1045 case DIAGDIR_SE: if ((v->y_pos & 0xF) != TILE_SIZE - 1) continue; break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1046 case DIAGDIR_SW: if ((v->x_pos & 0xF) != TILE_SIZE - 1) continue; break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1047 case DIAGDIR_NW: if ((v->y_pos & 0xF) != 0) continue; break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1048 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1049 } else if (v->z_pos > GetSlopeZ(v->x_pos, v->y_pos)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1050 v->tile = GetNorthernBridgeEnd(v->tile); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1051 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1052 continue; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1053 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1054 if (v->type == VEH_TRAIN) { |
12114
f020ec6be498
(svn r16527) -Codechange: use static member functions instead of simple casts when converting Vehicle to specialised vehicle types. Includes safety check
smatz <smatz@openttd.org>
parents:
12112
diff
changeset
|
1055 Train::From(v)->track = TRACK_BIT_WORMHOLE; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1056 } else { |
12114
f020ec6be498
(svn r16527) -Codechange: use static member functions instead of simple casts when converting Vehicle to specialised vehicle types. Includes safety check
smatz <smatz@openttd.org>
parents:
12112
diff
changeset
|
1057 RoadVehicle::From(v)->state = RVSB_WORMHOLE; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1058 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1059 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1060 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1061 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1062 /* Elrails got added in rev 24 */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1063 if (IsSavegameVersionBefore(24)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1064 RailType min_rail = RAILTYPE_ELECTRIC; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1065 |
12034
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1066 Train *v; |
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1067 FOR_ALL_TRAINS(v) { |
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1068 RailType rt = RailVehInfo(v->engine_type)->railtype; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1069 |
12034
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1070 v->railtype = rt; |
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1071 if (rt == RAILTYPE_ELECTRIC) min_rail = RAILTYPE_RAIL; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1072 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1073 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1074 /* .. so we convert the entire map from normal to elrail (so maintain "fairness") */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1075 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1076 switch (GetTileType(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1077 case MP_RAILWAY: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1078 SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1079 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1080 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1081 case MP_ROAD: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1082 if (IsLevelCrossing(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1083 SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1084 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1085 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1086 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1087 case MP_STATION: |
12501
44606771f552
(svn r16938) -Codechange: introduce helper function to tell whether a tile is either a rail station or rail waypoint tile
rubidium <rubidium@openttd.org>
parents:
12479
diff
changeset
|
1088 if (HasStationRail(t)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1089 SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1090 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1091 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1092 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1093 case MP_TUNNELBRIDGE: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1094 if (GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1095 SetRailType(t, UpdateRailType(GetRailType(t), min_rail)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1096 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1097 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1098 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1099 default: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1100 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1101 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1102 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1103 |
12034
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1104 FOR_ALL_TRAINS(v) { |
14261
2e1e5f37e2fb
(svn r18812) -Codechange: make some functions in train.h functions of Train.
rubidium <rubidium@openttd.org>
parents:
14258
diff
changeset
|
1105 if (v->IsFrontEngine() || v->IsFreeWagon()) v->ConsistChanged(true); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1106 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1107 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1108 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1109 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1110 /* In version 16.1 of the savegame a company can decide if trains, which get |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1111 * replaced, shall keep their old length. In all prior versions, just default |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1112 * to false */ |
16554
8db002e3e2d1
(svn r21282) -Codechange: Rename CheckSavegameVersionOldStyle() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16537
diff
changeset
|
1113 if (IsSavegameVersionBefore(16, 1)) { |
15370
a7ff8375c2c4
(svn r20013) -Fix [FS#3890]: silence some warnings / take the advice of the warnings into account
rubidium <rubidium@openttd.org>
parents:
15362
diff
changeset
|
1114 Company *c; |
11913
f67b6243e05a
(svn r16315) -Codechange: move the autorenew settings to a new CompanySettings struct
yexo <yexo@openttd.org>
parents:
11852
diff
changeset
|
1115 FOR_ALL_COMPANIES(c) c->settings.renew_keep_length = false; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1116 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1117 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1118 if (IsSavegameVersionBefore(123)) { |
12472
604a2cfc77ab
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
rubidium <rubidium@openttd.org>
parents:
12471
diff
changeset
|
1119 /* Waypoints became subclasses of stations ... */ |
604a2cfc77ab
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
rubidium <rubidium@openttd.org>
parents:
12471
diff
changeset
|
1120 MoveWaypointsToBaseStations(); |
604a2cfc77ab
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
rubidium <rubidium@openttd.org>
parents:
12471
diff
changeset
|
1121 /* ... and buoys were moved to waypoints. */ |
604a2cfc77ab
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
rubidium <rubidium@openttd.org>
parents:
12471
diff
changeset
|
1122 MoveBuoysToWaypoints(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1123 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1124 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1125 /* From version 15, we moved a semaphore bit from bit 2 to bit 3 in m4, making |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1126 * room for PBS. Now in version 21 move it back :P. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1127 if (IsSavegameVersionBefore(21) && !IsSavegameVersionBefore(15)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1128 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1129 switch (GetTileType(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1130 case MP_RAILWAY: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1131 if (HasSignals(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1132 /* convert PBS signals to combo-signals */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1133 if (HasBit(_m[t].m2, 2)) SetSignalType(t, TRACK_X, SIGTYPE_COMBO); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1134 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1135 /* move the signal variant back */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1136 SetSignalVariant(t, TRACK_X, HasBit(_m[t].m2, 3) ? SIG_SEMAPHORE : SIG_ELECTRIC); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1137 ClrBit(_m[t].m2, 3); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1138 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1139 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1140 /* Clear PBS reservation on track */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1141 if (!IsRailDepotTile(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1142 SB(_m[t].m4, 4, 4, 0); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1143 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1144 ClrBit(_m[t].m3, 6); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1145 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1146 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1147 |
11368
82c90cd591ab
(svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too
rubidium <rubidium@openttd.org>
parents:
11293
diff
changeset
|
1148 case MP_STATION: // Clear PBS reservation on station |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1149 ClrBit(_m[t].m3, 6); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1150 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1151 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1152 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1153 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1154 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1155 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1156 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1157 if (IsSavegameVersionBefore(25)) { |
12034
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1158 RoadVehicle *rv; |
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1159 FOR_ALL_ROADVEHICLES(rv) { |
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1160 rv->vehstatus &= ~0x40; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1161 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1162 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1163 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1164 if (IsSavegameVersionBefore(26)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1165 Station *st; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1166 FOR_ALL_STATIONS(st) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1167 st->last_vehicle_type = VEH_INVALID; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1168 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1169 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1170 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1171 YapfNotifyTrackLayoutChange(INVALID_TILE, INVALID_TRACK); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1172 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1173 if (IsSavegameVersionBefore(34)) { |
15370
a7ff8375c2c4
(svn r20013) -Fix [FS#3890]: silence some warnings / take the advice of the warnings into account
rubidium <rubidium@openttd.org>
parents:
15362
diff
changeset
|
1174 Company *c; |
a7ff8375c2c4
(svn r20013) -Fix [FS#3890]: silence some warnings / take the advice of the warnings into account
rubidium <rubidium@openttd.org>
parents:
15362
diff
changeset
|
1175 FOR_ALL_COMPANIES(c) ResetCompanyLivery(c); |
a7ff8375c2c4
(svn r20013) -Fix [FS#3890]: silence some warnings / take the advice of the warnings into account
rubidium <rubidium@openttd.org>
parents:
15362
diff
changeset
|
1176 } |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1177 |
15370
a7ff8375c2c4
(svn r20013) -Fix [FS#3890]: silence some warnings / take the advice of the warnings into account
rubidium <rubidium@openttd.org>
parents:
15362
diff
changeset
|
1178 Company *c; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1179 FOR_ALL_COMPANIES(c) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1180 c->avail_railtypes = GetCompanyRailtypes(c->index); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1181 c->avail_roadtypes = GetCompanyRoadtypes(c->index); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1182 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1183 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1184 if (!IsSavegameVersionBefore(27)) AfterLoadStations(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1185 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1186 /* Time starts at 0 instead of 1920. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1187 * Account for this in older games by adding an offset */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1188 if (IsSavegameVersionBefore(31)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1189 Station *st; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1190 Waypoint *wp; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1191 Engine *e; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1192 Industry *i; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1193 Vehicle *v; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1194 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1195 _date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1196 _cur_year += ORIGINAL_BASE_YEAR; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1197 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1198 FOR_ALL_STATIONS(st) st->build_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1199 FOR_ALL_WAYPOINTS(wp) wp->build_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1200 FOR_ALL_ENGINES(e) e->intro_date += DAYS_TILL_ORIGINAL_BASE_YEAR; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1201 FOR_ALL_COMPANIES(c) c->inaugurated_year += ORIGINAL_BASE_YEAR; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1202 FOR_ALL_INDUSTRIES(i) i->last_prod_year += ORIGINAL_BASE_YEAR; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1203 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1204 FOR_ALL_VEHICLES(v) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1205 v->date_of_last_service += DAYS_TILL_ORIGINAL_BASE_YEAR; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1206 v->build_year += ORIGINAL_BASE_YEAR; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1207 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1208 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1209 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1210 /* From 32 on we save the industry who made the farmland. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1211 * To give this prettyness to old savegames, we remove all farmfields and |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1212 * plant new ones. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1213 if (IsSavegameVersionBefore(32)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1214 Industry *i; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1215 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1216 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1217 if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_FIELDS)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1218 /* remove fields */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1219 MakeClear(t, CLEAR_GRASS, 3); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1220 } else if (IsTileType(t, MP_CLEAR) || IsTileType(t, MP_TREES)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1221 /* remove fences around fields */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1222 SetFenceSE(t, 0); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1223 SetFenceSW(t, 0); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1224 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1225 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1226 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1227 FOR_ALL_INDUSTRIES(i) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1228 uint j; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1229 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1230 if (GetIndustrySpec(i->type)->behaviour & INDUSTRYBEH_PLANT_ON_BUILT) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1231 for (j = 0; j != 50; j++) PlantRandomFarmField(i); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1232 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1233 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1234 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1235 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1236 /* Setting no refit flags to all orders in savegames from before refit in orders were added */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1237 if (IsSavegameVersionBefore(36)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1238 Order *order; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1239 Vehicle *v; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1240 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1241 FOR_ALL_ORDERS(order) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1242 order->SetRefit(CT_NO_REFIT); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1243 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1244 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1245 FOR_ALL_VEHICLES(v) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1246 v->current_order.SetRefit(CT_NO_REFIT); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1247 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1248 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1249 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1250 /* from version 38 we have optional elrails, since we cannot know the |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1251 * preference of a user, let elrails enabled; it can be disabled manually */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1252 if (IsSavegameVersionBefore(38)) _settings_game.vehicle.disable_elrails = false; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1253 /* do the same as when elrails were enabled/disabled manually just now */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1254 SettingsDisableElrail(_settings_game.vehicle.disable_elrails); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1255 InitializeRailGUI(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1256 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1257 /* From version 53, the map array was changed for house tiles to allow |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1258 * space for newhouses grf features. A new byte, m7, was also added. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1259 if (IsSavegameVersionBefore(53)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1260 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1261 if (IsTileType(t, MP_HOUSE)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1262 if (GB(_m[t].m3, 6, 2) != TOWN_HOUSE_COMPLETED) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1263 /* Move the construction stage from m3[7..6] to m5[5..4]. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1264 * The construction counter does not have to move. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1265 SB(_m[t].m5, 3, 2, GB(_m[t].m3, 6, 2)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1266 SB(_m[t].m3, 6, 2, 0); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1267 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1268 /* The "house is completed" bit is now in m6[2]. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1269 SetHouseCompleted(t, false); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1270 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1271 /* The "lift has destination" bit has been moved from |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1272 * m5[7] to m7[0]. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1273 SB(_me[t].m7, 0, 1, HasBit(_m[t].m5, 7)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1274 ClrBit(_m[t].m5, 7); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1275 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1276 /* The "lift is moving" bit has been removed, as it does |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1277 * the same job as the "lift has destination" bit. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1278 ClrBit(_m[t].m1, 7); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1279 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1280 /* The position of the lift goes from m1[7..0] to m6[7..2], |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1281 * making m1 totally free, now. The lift position does not |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1282 * have to be a full byte since the maximum value is 36. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1283 SetLiftPosition(t, GB(_m[t].m1, 0, 6 )); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1284 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1285 _m[t].m1 = 0; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1286 _m[t].m3 = 0; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1287 SetHouseCompleted(t, true); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1288 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1289 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1290 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1291 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1292 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1293 /* Check and update house and town values */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1294 UpdateHousesAndTowns(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1295 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1296 if (IsSavegameVersionBefore(43)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1297 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1298 if (IsTileType(t, MP_INDUSTRY)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1299 switch (GetIndustryGfx(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1300 case GFX_POWERPLANT_SPARKS: |
15933
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
1301 _m[t].m3 = GB(_m[t].m1, 2, 5); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1302 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1303 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1304 case GFX_OILWELL_ANIMATED_1: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1305 case GFX_OILWELL_ANIMATED_2: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1306 case GFX_OILWELL_ANIMATED_3: |
15933
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
1307 _m[t].m3 = GB(_m[t].m1, 0, 2); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1308 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1309 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1310 case GFX_COAL_MINE_TOWER_ANIMATED: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1311 case GFX_COPPER_MINE_TOWER_ANIMATED: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1312 case GFX_GOLD_MINE_TOWER_ANIMATED: |
15933
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
1313 _m[t].m3 = _m[t].m1; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1314 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1315 |
11368
82c90cd591ab
(svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too
rubidium <rubidium@openttd.org>
parents:
11293
diff
changeset
|
1316 default: // No animation states to change |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1317 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1318 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1319 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1320 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1321 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1322 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1323 if (IsSavegameVersionBefore(45)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1324 Vehicle *v; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1325 /* Originally just the fact that some cargo had been paid for was |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1326 * stored to stop people cheating and cashing in several times. This |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1327 * wasn't enough though as it was cleared when the vehicle started |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1328 * loading again, even if it didn't actually load anything, so now the |
12279
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1329 * amount that has been paid is stored. */ |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1330 FOR_ALL_VEHICLES(v) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1331 ClrBit(v->vehicle_flags, 2); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1332 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1333 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1334 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1335 /* Buoys do now store the owner of the previous water tile, which can never |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1336 * be OWNER_NONE. So replace OWNER_NONE with OWNER_WATER. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1337 if (IsSavegameVersionBefore(46)) { |
12472
604a2cfc77ab
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
rubidium <rubidium@openttd.org>
parents:
12471
diff
changeset
|
1338 Waypoint *wp; |
604a2cfc77ab
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
rubidium <rubidium@openttd.org>
parents:
12471
diff
changeset
|
1339 FOR_ALL_WAYPOINTS(wp) { |
604a2cfc77ab
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
rubidium <rubidium@openttd.org>
parents:
12471
diff
changeset
|
1340 if ((wp->facilities & FACIL_DOCK) != 0 && IsTileOwner(wp->xy, OWNER_NONE) && TileHeight(wp->xy) == 0) SetTileOwner(wp->xy, OWNER_WATER); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1341 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1342 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1343 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1344 if (IsSavegameVersionBefore(50)) { |
12035
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
1345 Aircraft *v; |
15511
fbbbb2791756
(svn r20164) -Fix [FS#3870]: inconsistencies w.r.t. to km/h vs km-ish/h as "base" unit for aircraft speeds
rubidium <rubidium@openttd.org>
parents:
15370
diff
changeset
|
1346 /* Aircraft units changed from 8 mph to 1 km-ish/h */ |
12035
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
1347 FOR_ALL_AIRCRAFT(v) { |
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
1348 if (v->subtype <= AIR_AIRCRAFT) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1349 const AircraftVehicleInfo *avi = AircraftVehInfo(v->engine_type); |
15511
fbbbb2791756
(svn r20164) -Fix [FS#3870]: inconsistencies w.r.t. to km/h vs km-ish/h as "base" unit for aircraft speeds
rubidium <rubidium@openttd.org>
parents:
15370
diff
changeset
|
1350 v->cur_speed *= 128; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1351 v->cur_speed /= 10; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1352 v->acceleration = avi->acceleration; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1353 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1354 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1355 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1356 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1357 if (IsSavegameVersionBefore(49)) FOR_ALL_COMPANIES(c) c->face = ConvertFromOldCompanyManagerFace(c->face); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1358 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1359 if (IsSavegameVersionBefore(52)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1360 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1361 if (IsStatueTile(t)) { |
11293
49968fa7d5e4
(svn r15642) -Codechange: use a default parameter value in CalcClosestTownFromTile
smatz <smatz@openttd.org>
parents:
11252
diff
changeset
|
1362 _m[t].m2 = CalcClosestTownFromTile(t)->index; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1363 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1364 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1365 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1366 |
11069
36d798171bfd
(svn r15410) -Cleanup: get rid of most of the references to the 'patches' except where it's used for backward compatability.
rubidium <rubidium@openttd.org>
parents:
11000
diff
changeset
|
1367 /* A setting containing the proportion of towns that grow twice as |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1368 * fast was added in version 54. From version 56 this is now saved in the |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1369 * town as cities can be built specifically in the scenario editor. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1370 if (IsSavegameVersionBefore(56)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1371 Town *t; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1372 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1373 FOR_ALL_TOWNS(t) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1374 if (_settings_game.economy.larger_towns != 0 && (t->index % _settings_game.economy.larger_towns) == 0) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1375 t->larger_town = true; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1376 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1377 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1378 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1379 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1380 if (IsSavegameVersionBefore(57)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1381 Vehicle *v; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1382 /* Added a FIFO queue of vehicles loading at stations */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1383 FOR_ALL_VEHICLES(v) { |
12300
7ec79afe8c18
(svn r16717) -Codechange: make IsFrontEngine() member of Train
smatz <smatz@openttd.org>
parents:
12297
diff
changeset
|
1384 if ((v->type != VEH_TRAIN || Train::From(v)->IsFrontEngine()) && // for all locs |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1385 !(v->vehstatus & (VS_STOPPED | VS_CRASHED)) && // not stopped or crashed |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1386 v->current_order.IsType(OT_LOADING)) { // loading |
11922
0a4b63f3f3c3
(svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index)
smatz <smatz@openttd.org>
parents:
11913
diff
changeset
|
1387 Station::Get(v->last_station_visited)->loading_vehicles.push_back(v); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1388 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1389 /* The loading finished flag is *only* set when actually completely |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1390 * finished. Because the vehicle is loading, it is not finished. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1391 ClrBit(v->vehicle_flags, VF_LOADING_FINISHED); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1392 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1393 } |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1394 } else if (IsSavegameVersionBefore(59)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1395 /* For some reason non-loading vehicles could be in the station's loading vehicle list */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1396 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1397 Station *st; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1398 FOR_ALL_STATIONS(st) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1399 std::list<Vehicle *>::iterator iter; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1400 for (iter = st->loading_vehicles.begin(); iter != st->loading_vehicles.end();) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1401 Vehicle *v = *iter; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1402 iter++; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1403 if (!v->current_order.IsType(OT_LOADING)) st->loading_vehicles.remove(v); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1404 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1405 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1406 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1407 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1408 if (IsSavegameVersionBefore(58)) { |
11069
36d798171bfd
(svn r15410) -Cleanup: get rid of most of the references to the 'patches' except where it's used for backward compatability.
rubidium <rubidium@openttd.org>
parents:
11000
diff
changeset
|
1409 /* Setting difficulty number_industries other than zero get bumped to +1 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1410 * since a new option (very low at position1) has been added */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1411 if (_settings_game.difficulty.number_industries > 0) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1412 _settings_game.difficulty.number_industries++; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1413 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1414 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1415 /* Same goes for number of towns, although no test is needed, just an increment */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1416 _settings_game.difficulty.number_towns++; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1417 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1418 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1419 if (IsSavegameVersionBefore(64)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1420 /* copy the signal type/variant and move signal states bits */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1421 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1422 if (IsTileType(t, MP_RAILWAY) && HasSignals(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1423 SetSignalStates(t, GB(_m[t].m2, 4, 4)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1424 SetSignalVariant(t, INVALID_TRACK, GetSignalVariant(t, TRACK_X)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1425 SetSignalType(t, INVALID_TRACK, GetSignalType(t, TRACK_X)); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1426 ClrBit(_m[t].m2, 7); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1427 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1428 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1429 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1430 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1431 if (IsSavegameVersionBefore(69)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1432 /* In some old savegames a bit was cleared when it should not be cleared */ |
12034
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1433 RoadVehicle *rv; |
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1434 FOR_ALL_ROADVEHICLES(rv) { |
11984
b6d3e583be86
(svn r16390) -Codechange: move u.road to RoadVehicle.
rubidium <rubidium@openttd.org>
parents:
11972
diff
changeset
|
1435 if (rv->state == 250 || rv->state == 251) { |
13875
052c69fbc76b
(svn r18404) -Codechange: link drive through stops better together
rubidium <rubidium@openttd.org>
parents:
13859
diff
changeset
|
1436 SetBit(rv->state, 2); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1437 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1438 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1439 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1440 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1441 if (IsSavegameVersionBefore(70)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1442 /* Added variables to support newindustries */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1443 Industry *i; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1444 FOR_ALL_INDUSTRIES(i) i->founder = OWNER_NONE; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1445 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1446 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1447 /* From version 82, old style canals (above sealevel (0), WATER owner) are no longer supported. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1448 Replace the owner for those by OWNER_NONE. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1449 if (IsSavegameVersionBefore(82)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1450 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1451 if (IsTileType(t, MP_WATER) && |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1452 GetWaterTileType(t) == WATER_TILE_CLEAR && |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1453 GetTileOwner(t) == OWNER_WATER && |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1454 TileHeight(t) != 0) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1455 SetTileOwner(t, OWNER_NONE); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1456 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1457 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1458 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1459 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1460 /* |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1461 * Add the 'previous' owner to the ship depots so we can reset it with |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1462 * the correct values when it gets destroyed. This prevents that |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1463 * someone can remove canals owned by somebody else and it prevents |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1464 * making floods using the removal of ship depots. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1465 */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1466 if (IsSavegameVersionBefore(83)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1467 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1468 if (IsTileType(t, MP_WATER) && IsShipDepot(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1469 _m[t].m4 = (TileHeight(t) == 0) ? OWNER_WATER : OWNER_NONE; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1470 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1471 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1472 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1473 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1474 if (IsSavegameVersionBefore(74)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1475 Station *st; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1476 FOR_ALL_STATIONS(st) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1477 for (CargoID c = 0; c < NUM_CARGO; c++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1478 st->goods[c].last_speed = 0; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1479 if (st->goods[c].cargo.Count() != 0) SetBit(st->goods[c].acceptance_pickup, GoodsEntry::PICKUP); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1480 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1481 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1482 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1483 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1484 if (IsSavegameVersionBefore(78)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1485 Industry *i; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1486 uint j; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1487 FOR_ALL_INDUSTRIES(i) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1488 const IndustrySpec *indsp = GetIndustrySpec(i->type); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1489 for (j = 0; j < lengthof(i->produced_cargo); j++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1490 i->produced_cargo[j] = indsp->produced_cargo[j]; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1491 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1492 for (j = 0; j < lengthof(i->accepts_cargo); j++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1493 i->accepts_cargo[j] = indsp->accepts_cargo[j]; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1494 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1495 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1496 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1497 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1498 /* Before version 81, the density of grass was always stored as zero, and |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1499 * grassy trees were always drawn fully grassy. Furthermore, trees on rough |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1500 * land used to have zero density, now they have full density. Therefore, |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1501 * make all grassy/rough land trees have a density of 3. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1502 if (IsSavegameVersionBefore(81)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1503 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1504 if (GetTileType(t) == MP_TREES) { |
14171
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
1505 TreeGround groundType = (TreeGround)GB(_m[t].m2, 4, 2); |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
1506 if (groundType != TREE_GROUND_SNOW_DESERT) SB(_m[t].m2, 6, 2, 3); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1507 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1508 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1509 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1510 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1511 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1512 if (IsSavegameVersionBefore(93)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1513 /* Rework of orders. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1514 Order *order; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1515 FOR_ALL_ORDERS(order) order->ConvertFromOldSavegame(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1516 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1517 Vehicle *v; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1518 FOR_ALL_VEHICLES(v) { |
11972
fd10870d74d4
(svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved
smatz <smatz@openttd.org>
parents:
11949
diff
changeset
|
1519 if (v->orders.list != NULL && v->orders.list->GetFirstOrder() != NULL && v->orders.list->GetFirstOrder()->IsType(OT_NOTHING)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1520 v->orders.list->FreeChain(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1521 v->orders.list = NULL; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1522 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1523 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1524 v->current_order.ConvertFromOldSavegame(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1525 if (v->type == VEH_ROAD && v->IsPrimaryVehicle() && v->FirstShared() == v) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1526 FOR_VEHICLE_ORDERS(v, order) order->SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1527 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1528 } |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1529 } else if (IsSavegameVersionBefore(94)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1530 /* Unload and transfer are now mutual exclusive. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1531 Order *order; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1532 FOR_ALL_ORDERS(order) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1533 if ((order->GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1534 order->SetUnloadType(OUFB_TRANSFER); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1535 order->SetLoadType(OLFB_NO_LOAD); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1536 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1537 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1538 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1539 Vehicle *v; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1540 FOR_ALL_VEHICLES(v) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1541 if ((v->current_order.GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1542 v->current_order.SetUnloadType(OUFB_TRANSFER); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1543 v->current_order.SetLoadType(OLFB_NO_LOAD); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1544 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1545 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1546 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1547 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1548 if (IsSavegameVersionBefore(84)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1549 /* Set all share owners to INVALID_COMPANY for |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1550 * 1) all inactive companies |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1551 * (when inactive companies were stored in the savegame - TTD, TTDP and some |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1552 * *really* old revisions of OTTD; else it is already set in InitializeCompanies()) |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1553 * 2) shares that are owned by inactive companies or self |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1554 * (caused by cheating clients in earlier revisions) */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1555 FOR_ALL_COMPANIES(c) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1556 for (uint i = 0; i < 4; i++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1557 CompanyID company = c->share_owners[i]; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1558 if (company == INVALID_COMPANY) continue; |
11924
fccc9cea27a7
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
smatz <smatz@openttd.org>
parents:
11922
diff
changeset
|
1559 if (!Company::IsValidID(company) || company == c->index) c->share_owners[i] = INVALID_COMPANY; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1560 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1561 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1562 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1563 |
15772
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1564 /* The water class was moved/unified. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1565 if (IsSavegameVersionBefore(146)) { |
15772
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1566 for (TileIndex t = 0; t < map_size; t++) { |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1567 switch (GetTileType(t)) { |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1568 case MP_STATION: |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1569 switch (GetStationType(t)) { |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1570 case STATION_OILRIG: |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1571 case STATION_DOCK: |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1572 case STATION_BUOY: |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1573 SetWaterClass(t, (WaterClass)GB(_m[t].m3, 0, 2)); |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1574 SB(_m[t].m3, 0, 2, 0); |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1575 break; |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1576 |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1577 default: |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1578 SetWaterClass(t, WATER_CLASS_INVALID); |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1579 break; |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1580 } |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1581 break; |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1582 |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1583 case MP_WATER: |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1584 SetWaterClass(t, (WaterClass)GB(_m[t].m3, 0, 2)); |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1585 SB(_m[t].m3, 0, 2, 0); |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1586 break; |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1587 |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1588 case MP_OBJECT: |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1589 SetWaterClass(t, WATER_CLASS_INVALID); |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1590 break; |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1591 |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1592 default: |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1593 /* No water class. */ |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1594 break; |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1595 } |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1596 } |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1597 } |
1a21d8e5c3fa
(svn r20446) -Codechange: unify the location of the water class
rubidium <rubidium@openttd.org>
parents:
15744
diff
changeset
|
1598 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1599 if (IsSavegameVersionBefore(86)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1600 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1601 /* Move river flag and update canals to use water class */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1602 if (IsTileType(t, MP_WATER)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1603 if (GetWaterClass(t) != WATER_CLASS_RIVER) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1604 if (IsWater(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1605 Owner o = GetTileOwner(t); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1606 if (o == OWNER_WATER) { |
13308
e44c31238b3c
(svn r17817) -Codechange: MakeWater actually made sea tiles, so rename it to MakeSea and unduplicate the code to make sea, rivers and canals.
rubidium <rubidium@openttd.org>
parents:
13307
diff
changeset
|
1607 MakeSea(t); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1608 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1609 MakeCanal(t, o, Random()); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1610 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1611 } else if (IsShipDepot(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1612 Owner o = (Owner)_m[t].m4; // Original water owner |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1613 SetWaterClass(t, o == OWNER_WATER ? WATER_CLASS_SEA : WATER_CLASS_CANAL); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1614 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1615 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1616 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1617 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1618 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1619 /* Update locks, depots, docks and buoys to have a water class based |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1620 * on its neighbouring tiles. Done after river and canal updates to |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1621 * ensure neighbours are correct. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1622 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1623 if (GetTileSlope(t, NULL) != SLOPE_FLAT) continue; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1624 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1625 if (IsTileType(t, MP_WATER) && IsLock(t)) SetWaterClassDependingOnSurroundings(t, false); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1626 if (IsTileType(t, MP_STATION) && (IsDock(t) || IsBuoy(t))) SetWaterClassDependingOnSurroundings(t, false); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1627 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1628 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1629 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1630 if (IsSavegameVersionBefore(87)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1631 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1632 /* skip oil rigs at borders! */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1633 if ((IsTileType(t, MP_WATER) || IsBuoyTile(t)) && |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1634 (TileX(t) == 0 || TileY(t) == 0 || TileX(t) == MapMaxX() - 1 || TileY(t) == MapMaxY() - 1)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1635 /* Some version 86 savegames have wrong water class at map borders (under buoy, or after removing buoy). |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1636 * This conversion has to be done before buoys with invalid owner are removed. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1637 SetWaterClass(t, WATER_CLASS_SEA); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1638 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1639 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1640 if (IsBuoyTile(t) || IsDriveThroughStopTile(t) || IsTileType(t, MP_WATER)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1641 Owner o = GetTileOwner(t); |
11924
fccc9cea27a7
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
smatz <smatz@openttd.org>
parents:
11922
diff
changeset
|
1642 if (o < MAX_COMPANIES && !Company::IsValidID(o)) { |
15292
e2c62d70dfcf
(svn r19931) -Fix (r19914): Convert assertion in Backup<> destructor into DEBUG() output. It was triggered on exceptions, especially when aborting world generation.
frosch <frosch@openttd.org>
parents:
15279
diff
changeset
|
1643 Backup<CompanyByte> cur_company(_current_company, o, FILE_LINE); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1644 ChangeTileOwner(t, o, INVALID_OWNER); |
15279
4e1862aebea2
(svn r19914) -Codechange: Wrap a helper class around temporary assignments of _current_company to ensure proper restoration.
frosch <frosch@openttd.org>
parents:
15221
diff
changeset
|
1645 cur_company.Restore(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1646 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1647 if (IsBuoyTile(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1648 /* reset buoy owner to OWNER_NONE in the station struct |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1649 * (even if it is owned by active company) */ |
12472
604a2cfc77ab
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
rubidium <rubidium@openttd.org>
parents:
12471
diff
changeset
|
1650 Waypoint::GetByTile(t)->owner = OWNER_NONE; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1651 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1652 } else if (IsTileType(t, MP_ROAD)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1653 /* works for all RoadTileType */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1654 for (RoadType rt = ROADTYPE_ROAD; rt < ROADTYPE_END; rt++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1655 /* update even non-existing road types to update tile owner too */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1656 Owner o = GetRoadOwner(t, rt); |
11924
fccc9cea27a7
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
smatz <smatz@openttd.org>
parents:
11922
diff
changeset
|
1657 if (o < MAX_COMPANIES && !Company::IsValidID(o)) SetRoadOwner(t, rt, OWNER_NONE); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1658 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1659 if (IsLevelCrossing(t)) { |
11924
fccc9cea27a7
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
smatz <smatz@openttd.org>
parents:
11922
diff
changeset
|
1660 if (!Company::IsValidID(GetTileOwner(t))) FixOwnerOfRailTrack(t); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1661 } |
11946
d5716f5a9844
(svn r16349) -Codechange: rename IsPlainRailTile() to IsPlainRail(), introduce shiny new IsPlainRailTile()
smatz <smatz@openttd.org>
parents:
11924
diff
changeset
|
1662 } else if (IsPlainRailTile(t)) { |
11924
fccc9cea27a7
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
smatz <smatz@openttd.org>
parents:
11922
diff
changeset
|
1663 if (!Company::IsValidID(GetTileOwner(t))) FixOwnerOfRailTrack(t); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1664 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1665 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1666 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1667 /* Convert old PF settings to new */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1668 if (_settings_game.pf.yapf.rail_use_yapf || IsSavegameVersionBefore(28)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1669 _settings_game.pf.pathfinder_for_trains = VPF_YAPF; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1670 } else { |
13833
ad09d18a3e34
(svn r18362) -Cleanup: remove OPF for RVs and NTP to clean up lots of code and simplify some things for the future
rubidium <rubidium@openttd.org>
parents:
13617
diff
changeset
|
1671 _settings_game.pf.pathfinder_for_trains = VPF_NPF; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1672 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1673 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1674 if (_settings_game.pf.yapf.road_use_yapf || IsSavegameVersionBefore(28)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1675 _settings_game.pf.pathfinder_for_roadvehs = VPF_YAPF; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1676 } else { |
13833
ad09d18a3e34
(svn r18362) -Cleanup: remove OPF for RVs and NTP to clean up lots of code and simplify some things for the future
rubidium <rubidium@openttd.org>
parents:
13617
diff
changeset
|
1677 _settings_game.pf.pathfinder_for_roadvehs = VPF_NPF; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1678 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1679 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1680 if (_settings_game.pf.yapf.ship_use_yapf) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1681 _settings_game.pf.pathfinder_for_ships = VPF_YAPF; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1682 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1683 _settings_game.pf.pathfinder_for_ships = (_settings_game.pf.new_pathfinding_all ? VPF_NPF : VPF_OPF); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1684 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1685 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1686 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1687 if (IsSavegameVersionBefore(88)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1688 /* Profits are now with 8 bit fract */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1689 Vehicle *v; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1690 FOR_ALL_VEHICLES(v) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1691 v->profit_this_year <<= 8; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1692 v->profit_last_year <<= 8; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1693 v->running_ticks = 0; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1694 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1695 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1696 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1697 if (IsSavegameVersionBefore(91)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1698 /* Increase HouseAnimationFrame from 5 to 7 bits */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1699 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1700 if (IsTileType(t, MP_HOUSE) && GetHouseType(t) >= NEW_HOUSE_OFFSET) { |
15933
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
1701 SB(_m[t].m6, 2, 6, GB(_m[t].m6, 3, 5)); |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
1702 SB(_m[t].m3, 5, 1, 0); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1703 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1704 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1705 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1706 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1707 if (IsSavegameVersionBefore(62)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1708 /* Remove all trams from savegames without tram support. |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1709 * There would be trams without tram track under causing crashes sooner or later. */ |
12035
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
1710 RoadVehicle *v; |
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
1711 FOR_ALL_ROADVEHICLES(v) { |
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
1712 if (v->First() == v && HasBit(EngInfo(v->engine_type)->misc_flags, EF_ROAD_TRAM)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1713 if (_switch_mode_errorstr == INVALID_STRING_ID || _switch_mode_errorstr == STR_NEWGRF_COMPATIBLE_LOAD_WARNING) { |
12632
e41943276802
(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives
rubidium <rubidium@openttd.org>
parents:
12555
diff
changeset
|
1714 _switch_mode_errorstr = STR_WARNING_LOADGAME_REMOVED_TRAMS; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1715 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1716 delete v; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1717 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1718 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1719 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1720 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1721 if (IsSavegameVersionBefore(99)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1722 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1723 /* Set newly introduced WaterClass of industry tiles */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1724 if (IsTileType(t, MP_STATION) && IsOilRig(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1725 SetWaterClassDependingOnSurroundings(t, true); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1726 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1727 if (IsTileType(t, MP_INDUSTRY)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1728 if ((GetIndustrySpec(GetIndustryType(t))->behaviour & INDUSTRYBEH_BUILT_ONWATER) != 0) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1729 SetWaterClassDependingOnSurroundings(t, true); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1730 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1731 SetWaterClass(t, WATER_CLASS_INVALID); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1732 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1733 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1734 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1735 /* Replace "house construction year" with "house age" */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1736 if (IsTileType(t, MP_HOUSE) && IsHouseCompleted(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1737 _m[t].m5 = Clamp(_cur_year - (_m[t].m5 + ORIGINAL_BASE_YEAR), 0, 0xFF); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1738 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1739 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1740 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1741 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1742 /* Move the signal variant back up one bit for PBS. We don't convert the old PBS |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1743 * format here, as an old layout wouldn't work properly anyway. To be safe, we |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1744 * clear any possible PBS reservations as well. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1745 if (IsSavegameVersionBefore(100)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1746 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1747 switch (GetTileType(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1748 case MP_RAILWAY: |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1749 if (HasSignals(t)) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1750 /* move the signal variant */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1751 SetSignalVariant(t, TRACK_UPPER, HasBit(_m[t].m2, 2) ? SIG_SEMAPHORE : SIG_ELECTRIC); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1752 SetSignalVariant(t, TRACK_LOWER, HasBit(_m[t].m2, 6) ? SIG_SEMAPHORE : SIG_ELECTRIC); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1753 ClrBit(_m[t].m2, 2); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1754 ClrBit(_m[t].m2, 6); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1755 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1756 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1757 /* Clear PBS reservation on track */ |
12471
c0587ce9da72
(svn r16908) -Codechange: s/DepotWaypointReservation/DepotReservation/
rubidium <rubidium@openttd.org>
parents:
12463
diff
changeset
|
1758 if (IsRailDepot(t)) { |
c0587ce9da72
(svn r16908) -Codechange: s/DepotWaypointReservation/DepotReservation/
rubidium <rubidium@openttd.org>
parents:
12463
diff
changeset
|
1759 SetDepotReservation(t, false); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1760 } else { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1761 SetTrackReservation(t, TRACK_BIT_NONE); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1762 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1763 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1764 |
11368
82c90cd591ab
(svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too
rubidium <rubidium@openttd.org>
parents:
11293
diff
changeset
|
1765 case MP_ROAD: // Clear PBS reservation on crossing |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1766 if (IsLevelCrossing(t)) SetCrossingReservation(t, false); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1767 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1768 |
11368
82c90cd591ab
(svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too
rubidium <rubidium@openttd.org>
parents:
11293
diff
changeset
|
1769 case MP_STATION: // Clear PBS reservation on station |
12502
9472b49c61a1
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
rubidium <rubidium@openttd.org>
parents:
12501
diff
changeset
|
1770 if (HasStationRail(t)) SetRailStationReservation(t, false); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1771 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1772 |
11368
82c90cd591ab
(svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too
rubidium <rubidium@openttd.org>
parents:
11293
diff
changeset
|
1773 case MP_TUNNELBRIDGE: // Clear PBS reservation on tunnels/birdges |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1774 if (GetTunnelBridgeTransportType(t) == TRANSPORT_RAIL) SetTunnelBridgeReservation(t, false); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1775 break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1776 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1777 default: break; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1778 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1779 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1780 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1781 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1782 /* Reserve all tracks trains are currently on. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1783 if (IsSavegameVersionBefore(101)) { |
12423
698a97a3744a
(svn r16857) -Fix [FS#3036](r16652): crash when train partially in depot crashed
smatz <smatz@openttd.org>
parents:
12421
diff
changeset
|
1784 const Train *t; |
12034
aa140a9c419c
(svn r16441) -Codechange: new class SpecializedVehicle used as superclass for all vehicle types
smatz <smatz@openttd.org>
parents:
12032
diff
changeset
|
1785 FOR_ALL_TRAINS(t) { |
12423
698a97a3744a
(svn r16857) -Fix [FS#3036](r16652): crash when train partially in depot crashed
smatz <smatz@openttd.org>
parents:
12421
diff
changeset
|
1786 if (t->First() == t) t->ReserveTrackUnderConsist(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1787 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1788 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1789 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1790 if (IsSavegameVersionBefore(102)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1791 for (TileIndex t = 0; t < map_size; t++) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1792 /* Now all crossings should be in correct state */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1793 if (IsLevelCrossingTile(t)) UpdateLevelCrossing(t, false); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1794 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1795 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1796 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1797 if (IsSavegameVersionBefore(103)) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1798 /* Non-town-owned roads now store the closest town */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1799 UpdateNearestTownForRoadTiles(false); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1800 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1801 /* signs with invalid owner left from older savegames */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1802 Sign *si; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1803 FOR_ALL_SIGNS(si) { |
11924
fccc9cea27a7
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
smatz <smatz@openttd.org>
parents:
11922
diff
changeset
|
1804 if (si->owner != OWNER_NONE && !Company::IsValidID(si->owner)) si->owner = OWNER_NONE; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1805 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1806 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1807 /* Station can get named based on an industry type, but the current ones |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1808 * are not, so mark them as if they are not named by an industry. */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1809 Station *st; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1810 FOR_ALL_STATIONS(st) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1811 st->indtype = IT_INVALID; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1812 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1813 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1814 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1815 if (IsSavegameVersionBefore(104)) { |
12035
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
1816 Aircraft *a; |
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
1817 FOR_ALL_AIRCRAFT(a) { |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1818 /* Set engine_type of shadow and rotor */ |
12384
d4b73a406cf3
(svn r16814) -Codechange: make IsNormalAircraft() member of Aircraft
smatz <smatz@openttd.org>
parents:
12380
diff
changeset
|
1819 if (!a->IsNormalAircraft()) { |
12035
dcc31c1d758a
(svn r16442) -Codechange: use new Vehicle accessors at more places
smatz <smatz@openttd.org>
parents:
12034
diff
changeset
|
1820 a->engine_type = a->First()->engine_type; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1821 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1822 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1823 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1824 /* More companies ... */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1825 Company *c; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1826 FOR_ALL_COMPANIES(c) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1827 if (c->bankrupt_asked == 0xFF) c->bankrupt_asked = 0xFFFF; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1828 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1829 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1830 Engine *e; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1831 FOR_ALL_ENGINES(e) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1832 if (e->company_avail == 0xFF) e->company_avail = 0xFFFF; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1833 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1834 |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1835 Town *t; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1836 FOR_ALL_TOWNS(t) { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1837 if (t->have_ratings == 0xFF) t->have_ratings = 0xFFFF; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1838 for (uint i = 8; i != MAX_COMPANIES; i++) t->ratings[i] = RATING_INITIAL; |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1839 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1840 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
1841 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1842 if (IsSavegameVersionBefore(112)) { |
10951
5077f19e169c
(svn r15290) -Codechange: Isolate size and section of the UnMovable HQ object, in order to keep the Unmovable type free of any irrelevant data
belugas <belugas@openttd.org>
parents:
10881
diff
changeset
|
1843 for (TileIndex t = 0; t < map_size; t++) { |
5077f19e169c
(svn r15290) -Codechange: Isolate size and section of the UnMovable HQ object, in order to keep the Unmovable type free of any irrelevant data
belugas <belugas@openttd.org>
parents:
10881
diff
changeset
|
1844 /* Check for HQ bit being set, instead of using map accessor, |
5077f19e169c
(svn r15290) -Codechange: Isolate size and section of the UnMovable HQ object, in order to keep the Unmovable type free of any irrelevant data
belugas <belugas@openttd.org>
parents:
10881
diff
changeset
|
1845 * since we've already changed it code-wise */ |
15744
f9e8032ac213
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
rubidium <rubidium@openttd.org>
parents:
15709
diff
changeset
|
1846 if (IsTileType(t, MP_OBJECT) && HasBit(_m[t].m5, 7)) { |
10951
5077f19e169c
(svn r15290) -Codechange: Isolate size and section of the UnMovable HQ object, in order to keep the Unmovable type free of any irrelevant data
belugas <belugas@openttd.org>
parents:
10881
diff
changeset
|
1847 /* Move size and part identification of HQ out of the m5 attribute, |
5077f19e169c
(svn r15290) -Codechange: Isolate size and section of the UnMovable HQ object, in order to keep the Unmovable type free of any irrelevant data
belugas <belugas@openttd.org>
parents:
10881
diff
changeset
|
1848 * on new locations */ |
15669
1cb744e35ef3
(svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension
rubidium <rubidium@openttd.org>
parents:
15623
diff
changeset
|
1849 _m[t].m3 = GB(_m[t].m5, 0, 5); |
15744
f9e8032ac213
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
rubidium <rubidium@openttd.org>
parents:
15709
diff
changeset
|
1850 _m[t].m5 = OBJECT_HQ; |
10951
5077f19e169c
(svn r15290) -Codechange: Isolate size and section of the UnMovable HQ object, in order to keep the Unmovable type free of any irrelevant data
belugas <belugas@openttd.org>
parents:
10881
diff
changeset
|
1851 } |
5077f19e169c
(svn r15290) -Codechange: Isolate size and section of the UnMovable HQ object, in order to keep the Unmovable type free of any irrelevant data
belugas <belugas@openttd.org>
parents:
10881
diff
changeset
|
1852 } |
5077f19e169c
(svn r15290) -Codechange: Isolate size and section of the UnMovable HQ object, in order to keep the Unmovable type free of any irrelevant data
belugas <belugas@openttd.org>
parents:
10881
diff
changeset
|
1853 } |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1854 if (IsSavegameVersionBefore(144)) { |
15669
1cb744e35ef3
(svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension
rubidium <rubidium@openttd.org>
parents:
15623
diff
changeset
|
1855 for (TileIndex t = 0; t < map_size; t++) { |
15744
f9e8032ac213
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
rubidium <rubidium@openttd.org>
parents:
15709
diff
changeset
|
1856 if (!IsTileType(t, MP_OBJECT)) continue; |
15669
1cb744e35ef3
(svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension
rubidium <rubidium@openttd.org>
parents:
15623
diff
changeset
|
1857 |
15744
f9e8032ac213
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
rubidium <rubidium@openttd.org>
parents:
15709
diff
changeset
|
1858 /* Reordering/generalisation of the object bits. */ |
f9e8032ac213
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
rubidium <rubidium@openttd.org>
parents:
15709
diff
changeset
|
1859 ObjectType type = GetObjectType(t); |
15807
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1860 SB(_m[t].m6, 2, 4, type == OBJECT_HQ ? GB(_m[t].m3, 2, 3) : 0); |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1861 _m[t].m3 = type == OBJECT_HQ ? GB(_m[t].m3, 1, 1) | GB(_m[t].m3, 0, 1) << 4 : 0; |
15669
1cb744e35ef3
(svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension
rubidium <rubidium@openttd.org>
parents:
15623
diff
changeset
|
1862 |
1cb744e35ef3
(svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension
rubidium <rubidium@openttd.org>
parents:
15623
diff
changeset
|
1863 /* Make sure those bits are clear as well! */ |
1cb744e35ef3
(svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension
rubidium <rubidium@openttd.org>
parents:
15623
diff
changeset
|
1864 _m[t].m4 = 0; |
1cb744e35ef3
(svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension
rubidium <rubidium@openttd.org>
parents:
15623
diff
changeset
|
1865 _me[t].m7 = 0; |
1cb744e35ef3
(svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension
rubidium <rubidium@openttd.org>
parents:
15623
diff
changeset
|
1866 } |
1cb744e35ef3
(svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension
rubidium <rubidium@openttd.org>
parents:
15623
diff
changeset
|
1867 } |
10951
5077f19e169c
(svn r15290) -Codechange: Isolate size and section of the UnMovable HQ object, in order to keep the Unmovable type free of any irrelevant data
belugas <belugas@openttd.org>
parents:
10881
diff
changeset
|
1868 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1869 if (IsSavegameVersionBefore(147) && Object::GetNumItems() == 0) { |
15807
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1870 /* Make real objects for object tiles. */ |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1871 for (TileIndex t = 0; t < map_size; t++) { |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1872 if (!IsTileType(t, MP_OBJECT)) continue; |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1873 |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1874 if (Town::GetNumItems() == 0) { |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1875 /* No towns, so remove all objects! */ |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1876 DoClearSquare(t); |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1877 } else { |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1878 uint offset = _m[t].m3; |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1879 |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1880 /* Also move the animation state. */ |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1881 _m[t].m3 = GB(_m[t].m6, 2, 4); |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1882 SB(_m[t].m6, 2, 4, 0); |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1883 |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1884 if (offset == 0) { |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1885 /* No offset, so make the object. */ |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1886 ObjectType type = GetObjectType(t); |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1887 int size = type == OBJECT_HQ ? 2 : 1; |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1888 |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1889 Object *o = new Object(); |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1890 o->location.tile = t; |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1891 o->location.w = size; |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1892 o->location.h = size; |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1893 o->build_date = _date; |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1894 o->town = type == OBJECT_STATUE ? Town::Get(_m[t].m2) : CalcClosestTownFromTile(t, UINT_MAX); |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1895 _m[t].m2 = o->index; |
15968
c8215bd591e2
(svn r20656) -Codechange: implement counting of objects
rubidium <rubidium@openttd.org>
parents:
15946
diff
changeset
|
1896 Object::IncTypeCount(type); |
15807
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1897 } else { |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1898 /* We're at an offset, so get the ID from our "root". */ |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1899 TileIndex northern_tile = t - TileXY(GB(offset, 0, 4), GB(offset, 4, 4)); |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1900 assert(IsTileType(northern_tile, MP_OBJECT)); |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1901 _m[t].m2 = _m[northern_tile].m2; |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1902 } |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1903 } |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1904 } |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1905 } |
9561d91e0869
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
rubidium <rubidium@openttd.org>
parents:
15772
diff
changeset
|
1906 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1907 if (IsSavegameVersionBefore(113)) { |
11000
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1908 /* allow_town_roads is added, set it if town_layout wasn't TL_NO_ROADS */ |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1909 if (_settings_game.economy.town_layout == 0) { // was TL_NO_ROADS |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1910 _settings_game.economy.allow_town_roads = false; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1911 _settings_game.economy.town_layout = TL_BETTER_ROADS; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1912 } else { |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1913 _settings_game.economy.allow_town_roads = true; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1914 _settings_game.economy.town_layout = _settings_game.economy.town_layout - 1; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1915 } |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1916 |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1917 /* Initialize layout of all towns. Older versions were using different |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1918 * generator for random town layout, use it if needed. */ |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1919 Town *t; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1920 FOR_ALL_TOWNS(t) { |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1921 if (_settings_game.economy.town_layout != TL_RANDOM) { |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1922 t->layout = _settings_game.economy.town_layout; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1923 continue; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1924 } |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1925 |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1926 /* Use old layout randomizer code */ |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1927 byte layout = TileHash(TileX(t->xy), TileY(t->xy)) % 6; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1928 switch (layout) { |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1929 default: break; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1930 case 5: layout = 1; break; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1931 case 0: layout = 2; break; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1932 } |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1933 t->layout = layout - 1; |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1934 } |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1935 } |
def5dbb7e314
(svn r15340) -Fix [FS#2121]: changing town road layout in-game caused ugly road networks
smatz <smatz@openttd.org>
parents:
10960
diff
changeset
|
1936 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1937 if (IsSavegameVersionBefore(114)) { |
11234
6ebdffe6e5e6
(svn r15588) -Fix: change owner of waypoints and deleted stations when merging companies or when a company benkrupts
smatz <smatz@openttd.org>
parents:
11085
diff
changeset
|
1938 /* There could be (deleted) stations with invalid owner, set owner to OWNER NONE. |
6ebdffe6e5e6
(svn r15588) -Fix: change owner of waypoints and deleted stations when merging companies or when a company benkrupts
smatz <smatz@openttd.org>
parents:
11085
diff
changeset
|
1939 * The conversion affects oil rigs and buoys too, but it doesn't matter as |
6ebdffe6e5e6
(svn r15588) -Fix: change owner of waypoints and deleted stations when merging companies or when a company benkrupts
smatz <smatz@openttd.org>
parents:
11085
diff
changeset
|
1940 * they have st->owner == OWNER_NONE already. */ |
6ebdffe6e5e6
(svn r15588) -Fix: change owner of waypoints and deleted stations when merging companies or when a company benkrupts
smatz <smatz@openttd.org>
parents:
11085
diff
changeset
|
1941 Station *st; |
6ebdffe6e5e6
(svn r15588) -Fix: change owner of waypoints and deleted stations when merging companies or when a company benkrupts
smatz <smatz@openttd.org>
parents:
11085
diff
changeset
|
1942 FOR_ALL_STATIONS(st) { |
11924
fccc9cea27a7
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
smatz <smatz@openttd.org>
parents:
11922
diff
changeset
|
1943 if (!Company::IsValidID(st->owner)) st->owner = OWNER_NONE; |
11234
6ebdffe6e5e6
(svn r15588) -Fix: change owner of waypoints and deleted stations when merging companies or when a company benkrupts
smatz <smatz@openttd.org>
parents:
11085
diff
changeset
|
1944 } |
6ebdffe6e5e6
(svn r15588) -Fix: change owner of waypoints and deleted stations when merging companies or when a company benkrupts
smatz <smatz@openttd.org>
parents:
11085
diff
changeset
|
1945 } |
6ebdffe6e5e6
(svn r15588) -Fix: change owner of waypoints and deleted stations when merging companies or when a company benkrupts
smatz <smatz@openttd.org>
parents:
11085
diff
changeset
|
1946 |
11657
ff1084d0d8a0
(svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station.
rubidium <rubidium@openttd.org>
parents:
11441
diff
changeset
|
1947 /* Trains could now stop in a specific location. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1948 if (IsSavegameVersionBefore(117)) { |
11657
ff1084d0d8a0
(svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station.
rubidium <rubidium@openttd.org>
parents:
11441
diff
changeset
|
1949 Order *o; |
ff1084d0d8a0
(svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station.
rubidium <rubidium@openttd.org>
parents:
11441
diff
changeset
|
1950 FOR_ALL_ORDERS(o) { |
ff1084d0d8a0
(svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station.
rubidium <rubidium@openttd.org>
parents:
11441
diff
changeset
|
1951 if (o->IsType(OT_GOTO_STATION)) o->SetStopLocation(OSL_PLATFORM_FAR_END); |
ff1084d0d8a0
(svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station.
rubidium <rubidium@openttd.org>
parents:
11441
diff
changeset
|
1952 } |
ff1084d0d8a0
(svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station.
rubidium <rubidium@openttd.org>
parents:
11441
diff
changeset
|
1953 } |
ff1084d0d8a0
(svn r16037) -Feature: allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station.
rubidium <rubidium@openttd.org>
parents:
11441
diff
changeset
|
1954 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1955 if (IsSavegameVersionBefore(120)) { |
12032
2afeb10ae6ba
(svn r16439) -Change: Make the default vehicle servicing settings company-based settings, so in a multiplayer game everyone can change them.
yexo <yexo@openttd.org>
parents:
12001
diff
changeset
|
1956 extern VehicleDefaultSettings _old_vds; |
2afeb10ae6ba
(svn r16439) -Change: Make the default vehicle servicing settings company-based settings, so in a multiplayer game everyone can change them.
yexo <yexo@openttd.org>
parents:
12001
diff
changeset
|
1957 Company *c; |
2afeb10ae6ba
(svn r16439) -Change: Make the default vehicle servicing settings company-based settings, so in a multiplayer game everyone can change them.
yexo <yexo@openttd.org>
parents:
12001
diff
changeset
|
1958 FOR_ALL_COMPANIES(c) { |
2afeb10ae6ba
(svn r16439) -Change: Make the default vehicle servicing settings company-based settings, so in a multiplayer game everyone can change them.
yexo <yexo@openttd.org>
parents:
12001
diff
changeset
|
1959 c->settings.vehicle = _old_vds; |
2afeb10ae6ba
(svn r16439) -Change: Make the default vehicle servicing settings company-based settings, so in a multiplayer game everyone can change them.
yexo <yexo@openttd.org>
parents:
12001
diff
changeset
|
1960 } |
2afeb10ae6ba
(svn r16439) -Change: Make the default vehicle servicing settings company-based settings, so in a multiplayer game everyone can change them.
yexo <yexo@openttd.org>
parents:
12001
diff
changeset
|
1961 } |
2afeb10ae6ba
(svn r16439) -Change: Make the default vehicle servicing settings company-based settings, so in a multiplayer game everyone can change them.
yexo <yexo@openttd.org>
parents:
12001
diff
changeset
|
1962 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1963 if (IsSavegameVersionBefore(121)) { |
12112
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1964 /* Delete small ufos heading for non-existing vehicles */ |
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1965 Vehicle *v; |
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1966 FOR_ALL_DISASTERVEHICLES(v) { |
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1967 if (v->subtype == 2/*ST_SMALL_UFO*/ && v->current_order.GetDestination() != 0) { |
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1968 const Vehicle *u = Vehicle::GetIfValid(v->dest_tile); |
17123
a18c14f0bb2b
(svn r21860) -Codechange: Rename road vehicle subtype functions to match the train names.
terkhen <terkhen@openttd.org>
parents:
17058
diff
changeset
|
1969 if (u == NULL || u->type != VEH_ROAD || !RoadVehicle::From(u)->IsFrontEngine()) { |
12112
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1970 delete v; |
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1971 } |
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1972 } |
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1973 } |
12279
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1974 |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1975 /* We didn't store cargo payment yet, so make them for vehicles that are |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1976 * currently at a station and loading/unloading. If they don't get any |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1977 * payment anymore they just removed in the next load/unload cycle. |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1978 * However, some 0.7 versions might have cargo payment. For those we just |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1979 * add cargopayment for the vehicles that don't have it. |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1980 */ |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1981 Station *st; |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1982 FOR_ALL_STATIONS(st) { |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1983 std::list<Vehicle *>::iterator iter; |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1984 for (iter = st->loading_vehicles.begin(); iter != st->loading_vehicles.end(); ++iter) { |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1985 Vehicle *v = *iter; |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1986 if (v->cargo_payment == NULL) v->cargo_payment = new CargoPayment(v); |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1987 } |
329b186db8cd
(svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
rubidium <rubidium@openttd.org>
parents:
12249
diff
changeset
|
1988 } |
12112
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1989 } |
527e86d95414
(svn r16525) -Codechange: Notify small ufos on deletion of road vehicles, so they can head for somewhere else instead of stumbling over a ghost.
frosch <frosch@openttd.org>
parents:
12035
diff
changeset
|
1990 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
1991 if (IsSavegameVersionBefore(122)) { |
12292
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
1992 /* Animated tiles would sometimes not be actually animated or |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
1993 * in case of old savegames duplicate. */ |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
1994 |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
1995 extern TileIndex *_animated_tile_list; |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
1996 extern uint _animated_tile_count; |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
1997 |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
1998 for (uint i = 0; i < _animated_tile_count; /* Nothing */) { |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
1999 /* Remove if tile is not animated */ |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2000 bool remove = _tile_type_procs[GetTileType(_animated_tile_list[i])]->animate_tile_proc == NULL; |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2001 |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2002 /* and remove if duplicate */ |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2003 for (uint j = 0; !remove && j < i; j++) { |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2004 remove = _animated_tile_list[i] == _animated_tile_list[j]; |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2005 } |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2006 |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2007 if (remove) { |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2008 DeleteAnimatedTile(_animated_tile_list[i]); |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2009 } else { |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2010 i++; |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2011 } |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2012 } |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2013 } |
a6d140648fde
(svn r16709) -Fix [FS#2994]: the list of animated tiles could have duplicates (only for old savegames) and tiles that weren't animated
rubidium <rubidium@openttd.org>
parents:
12279
diff
changeset
|
2014 |
17058
2bbacb524f85
(svn r21795) -Fix (r21790): when converting TTDPatch train waypoints, convert the data on the map as well
rubidium <rubidium@openttd.org>
parents:
17056
diff
changeset
|
2015 if (IsSavegameVersionBefore(124) && !IsSavegameVersionBefore(1)) { |
2bbacb524f85
(svn r21795) -Fix (r21790): when converting TTDPatch train waypoints, convert the data on the map as well
rubidium <rubidium@openttd.org>
parents:
17056
diff
changeset
|
2016 /* The train station tile area was added, but for really old (TTDPatch) it's already valid. */ |
12555
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2017 Waypoint *wp; |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2018 FOR_ALL_WAYPOINTS(wp) { |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2019 if (wp->facilities & FACIL_TRAIN) { |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2020 wp->train_station.tile = wp->xy; |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2021 wp->train_station.w = 1; |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2022 wp->train_station.h = 1; |
16922
bb19fe74c797
(svn r21657) -Cleanup (r17107): remove superfluous semicolon
smatz <smatz@openttd.org>
parents:
16783
diff
changeset
|
2023 } else { |
12555
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2024 wp->train_station.tile = INVALID_TILE; |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2025 wp->train_station.w = 0; |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2026 wp->train_station.h = 0; |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2027 } |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2028 } |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2029 } |
e814b879d2e1
(svn r16993) -Change: make the rail waypoint builder draggable
rubidium <rubidium@openttd.org>
parents:
12525
diff
changeset
|
2030 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2031 if (IsSavegameVersionBefore(125)) { |
12658
b75d8c6681bd
(svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source
smatz <smatz@openttd.org>
parents:
12652
diff
changeset
|
2032 /* Convert old subsidies */ |
12652
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2033 Subsidy *s; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2034 FOR_ALL_SUBSIDIES(s) { |
12658
b75d8c6681bd
(svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source
smatz <smatz@openttd.org>
parents:
12652
diff
changeset
|
2035 if (s->remaining < 12) { |
13370
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2036 /* Converting nonawarded subsidy */ |
12658
b75d8c6681bd
(svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source
smatz <smatz@openttd.org>
parents:
12652
diff
changeset
|
2037 s->remaining = 12 - s->remaining; // convert "age" to "remaining" |
b75d8c6681bd
(svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source
smatz <smatz@openttd.org>
parents:
12652
diff
changeset
|
2038 s->awarded = INVALID_COMPANY; // not awarded to anyone |
12652
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2039 const CargoSpec *cs = CargoSpec::Get(s->cargo_type); |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2040 switch (cs->town_effect) { |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2041 case TE_PASSENGERS: |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2042 case TE_MAIL: |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2043 /* Town -> Town */ |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2044 s->src_type = s->dst_type = ST_TOWN; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2045 if (Town::IsValidID(s->src) && Town::IsValidID(s->dst)) continue; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2046 break; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2047 case TE_GOODS: |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2048 case TE_FOOD: |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2049 /* Industry -> Town */ |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2050 s->src_type = ST_INDUSTRY; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2051 s->dst_type = ST_TOWN; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2052 if (Industry::IsValidID(s->src) && Town::IsValidID(s->dst)) continue; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2053 break; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2054 default: |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2055 /* Industry -> Industry */ |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2056 s->src_type = s->dst_type = ST_INDUSTRY; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2057 if (Industry::IsValidID(s->src) && Industry::IsValidID(s->dst)) continue; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2058 break; |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2059 } |
13370
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2060 } else { |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2061 /* Do our best for awarded subsidies. The original source or destination industry |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2062 * can't be determined anymore for awarded subsidies, so invalidate them. |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2063 * Town -> Town subsidies are converted using simple heuristic */ |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2064 s->remaining = 24 - s->remaining; // convert "age of awarded subsidy" to "remaining" |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2065 const CargoSpec *cs = CargoSpec::Get(s->cargo_type); |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2066 switch (cs->town_effect) { |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2067 case TE_PASSENGERS: |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2068 case TE_MAIL: { |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2069 /* Town -> Town */ |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2070 const Station *ss = Station::GetIfValid(s->src); |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2071 const Station *sd = Station::GetIfValid(s->dst); |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2072 if (ss != NULL && sd != NULL && ss->owner == sd->owner && |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2073 Company::IsValidID(ss->owner)) { |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2074 s->src_type = s->dst_type = ST_TOWN; |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2075 s->src = ss->town->index; |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2076 s->dst = sd->town->index; |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2077 s->awarded = ss->owner; |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2078 continue; |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2079 } |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2080 break; |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2081 } |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2082 default: |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2083 break; |
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2084 } |
12652
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2085 } |
13370
3b5a2d007df2
(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)
smatz <smatz@openttd.org>
parents:
13308
diff
changeset
|
2086 /* Awarded non-town subsidy or invalid source/destination, invalidate */ |
12669
406f4ae1e2ca
(svn r17124) -Codechange: store subsidies in a pool (instead of an array)
smatz <smatz@openttd.org>
parents:
12664
diff
changeset
|
2087 delete s; |
12652
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2088 } |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2089 } |
0f7fab6a27e9
(svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed
smatz <smatz@openttd.org>
parents:
12632
diff
changeset
|
2090 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2091 if (IsSavegameVersionBefore(126)) { |
12940
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2092 /* Recompute inflation based on old unround loan limit |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2093 * Note: Max loan is 500000. With an inflation of 4% across 170 years |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2094 * that results in a max loan of about 0.7 * 2^31. |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2095 * So taking the 16 bit fractional part into account there are plenty of bits left |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2096 * for unmodified savegames ... |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2097 */ |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2098 uint64 aimed_inflation = (_economy.old_max_loan_unround << 16 | _economy.old_max_loan_unround_fract) / _settings_game.difficulty.max_loan; |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2099 |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2100 /* ... well, just clamp it then. */ |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2101 if (aimed_inflation > MAX_INFLATION) aimed_inflation = MAX_INFLATION; |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2102 |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2103 /* Simulate the inflation, so we also get the payment inflation */ |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2104 while (_economy.inflation_prices < aimed_inflation) { |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2105 AddInflation(false); |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2106 } |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2107 } |
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2108 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2109 if (IsSavegameVersionBefore(127)) { |
12946
560c26f15688
(svn r17439) -Fix (r17436): you weren't paid for cargo delivered to houses and headquarters anymore
smatz <smatz@openttd.org>
parents:
12940
diff
changeset
|
2110 Station *st; |
560c26f15688
(svn r17439) -Fix (r17436): you weren't paid for cargo delivered to houses and headquarters anymore
smatz <smatz@openttd.org>
parents:
12940
diff
changeset
|
2111 FOR_ALL_STATIONS(st) UpdateStationAcceptance(st, false); |
560c26f15688
(svn r17439) -Fix (r17436): you weren't paid for cargo delivered to houses and headquarters anymore
smatz <smatz@openttd.org>
parents:
12940
diff
changeset
|
2112 } |
560c26f15688
(svn r17439) -Fix (r17436): you weren't paid for cargo delivered to houses and headquarters anymore
smatz <smatz@openttd.org>
parents:
12940
diff
changeset
|
2113 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2114 if (IsSavegameVersionBefore(128)) { |
12999
07a634b14de8
(svn r17493) -Codechange: store the depot index on the map
rubidium <rubidium@openttd.org>
parents:
12998
diff
changeset
|
2115 const Depot *d; |
07a634b14de8
(svn r17493) -Codechange: store the depot index on the map
rubidium <rubidium@openttd.org>
parents:
12998
diff
changeset
|
2116 FOR_ALL_DEPOTS(d) { |
07a634b14de8
(svn r17493) -Codechange: store the depot index on the map
rubidium <rubidium@openttd.org>
parents:
12998
diff
changeset
|
2117 _m[d->xy].m2 = d->index; |
07a634b14de8
(svn r17493) -Codechange: store the depot index on the map
rubidium <rubidium@openttd.org>
parents:
12998
diff
changeset
|
2118 if (IsTileType(d->xy, MP_WATER)) _m[GetOtherShipDepotTile(d->xy)].m2 = d->index; |
07a634b14de8
(svn r17493) -Codechange: store the depot index on the map
rubidium <rubidium@openttd.org>
parents:
12998
diff
changeset
|
2119 } |
07a634b14de8
(svn r17493) -Codechange: store the depot index on the map
rubidium <rubidium@openttd.org>
parents:
12998
diff
changeset
|
2120 } |
07a634b14de8
(svn r17493) -Codechange: store the depot index on the map
rubidium <rubidium@openttd.org>
parents:
12998
diff
changeset
|
2121 |
13977
bb2258bdc43d
(svn r18515) -Change: make it visible when you're to pass the next signal on danger and possible to cancel it
rubidium <rubidium@openttd.org>
parents:
13968
diff
changeset
|
2122 /* The behaviour of force_proceed has been changed. Now |
bb2258bdc43d
(svn r18515) -Change: make it visible when you're to pass the next signal on danger and possible to cancel it
rubidium <rubidium@openttd.org>
parents:
13968
diff
changeset
|
2123 * it counts signals instead of some random time out. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2124 if (IsSavegameVersionBefore(131)) { |
13977
bb2258bdc43d
(svn r18515) -Change: make it visible when you're to pass the next signal on danger and possible to cancel it
rubidium <rubidium@openttd.org>
parents:
13968
diff
changeset
|
2125 Train *t; |
bb2258bdc43d
(svn r18515) -Change: make it visible when you're to pass the next signal on danger and possible to cancel it
rubidium <rubidium@openttd.org>
parents:
13968
diff
changeset
|
2126 FOR_ALL_TRAINS(t) { |
15362
834b4f9842c2
(svn r20005) -Codechange: Enumify force_proceed.
frosch <frosch@openttd.org>
parents:
15360
diff
changeset
|
2127 if (t->force_proceed != TFP_NONE) { |
834b4f9842c2
(svn r20005) -Codechange: Enumify force_proceed.
frosch <frosch@openttd.org>
parents:
15360
diff
changeset
|
2128 t->force_proceed = TFP_STUCK; |
834b4f9842c2
(svn r20005) -Codechange: Enumify force_proceed.
frosch <frosch@openttd.org>
parents:
15360
diff
changeset
|
2129 } |
13977
bb2258bdc43d
(svn r18515) -Change: make it visible when you're to pass the next signal on danger and possible to cancel it
rubidium <rubidium@openttd.org>
parents:
13968
diff
changeset
|
2130 } |
bb2258bdc43d
(svn r18515) -Change: make it visible when you're to pass the next signal on danger and possible to cancel it
rubidium <rubidium@openttd.org>
parents:
13968
diff
changeset
|
2131 } |
bb2258bdc43d
(svn r18515) -Change: make it visible when you're to pass the next signal on danger and possible to cancel it
rubidium <rubidium@openttd.org>
parents:
13968
diff
changeset
|
2132 |
14171
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2133 /* The bits for the tree ground and tree density have |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2134 * been swapped (m2 bits 7..6 and 5..4. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2135 if (IsSavegameVersionBefore(135)) { |
14171
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2136 for (TileIndex t = 0; t < map_size; t++) { |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2137 if (IsTileType(t, MP_CLEAR)) { |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2138 if (GetRawClearGround(t) == CLEAR_SNOW) { |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2139 SetClearGroundDensity(t, CLEAR_GRASS, GetClearDensity(t)); |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2140 SetBit(_m[t].m3, 4); |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2141 } else { |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2142 ClrBit(_m[t].m3, 4); |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2143 } |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2144 } |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2145 if (IsTileType(t, MP_TREES)) { |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2146 uint density = GB(_m[t].m2, 6, 2); |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2147 uint ground = GB(_m[t].m2, 4, 2); |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2148 uint counter = GB(_m[t].m2, 0, 4); |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2149 _m[t].m2 = ground << 6 | density << 4 | counter; |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2150 } |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2151 } |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2152 } |
72a4eae02e7d
(svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline
yexo <yexo@openttd.org>
parents:
13977
diff
changeset
|
2153 |
14213
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2154 /* Wait counter and load/unload ticks got split. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2155 if (IsSavegameVersionBefore(136)) { |
14213
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2156 Aircraft *a; |
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2157 FOR_ALL_AIRCRAFT(a) { |
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2158 a->turn_counter = a->current_order.IsType(OT_LOADING) ? 0 : a->load_unload_ticks; |
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2159 } |
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2160 |
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2161 Train *t; |
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2162 FOR_ALL_TRAINS(t) { |
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2163 t->wait_counter = t->current_order.IsType(OT_LOADING) ? 0 : t->load_unload_ticks; |
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2164 } |
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2165 } |
41b2e7bf03da
(svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way
rubidium <rubidium@openttd.org>
parents:
14171
diff
changeset
|
2166 |
14357
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2167 /* Airport tile animation uses animation frame instead of other graphics id */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2168 if (IsSavegameVersionBefore(137)) { |
14357
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2169 struct AirportTileConversion { |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2170 byte old_start; |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2171 byte num_frames; |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2172 }; |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2173 static const AirportTileConversion atc[] = { |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2174 {31, 12}, // APT_RADAR_GRASS_FENCE_SW |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2175 {50, 4}, // APT_GRASS_FENCE_NE_FLAG |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2176 {62, 2}, // 1 unused tile |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2177 {66, 12}, // APT_RADAR_FENCE_SW |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2178 {78, 12}, // APT_RADAR_FENCE_NE |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2179 {101, 10}, // 9 unused tiles |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2180 {111, 8}, // 7 unused tiles |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2181 {119, 15}, // 14 unused tiles (radar) |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2182 {140, 4}, // APT_GRASS_FENCE_NE_FLAG_2 |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2183 }; |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2184 for (TileIndex t = 0; t < map_size; t++) { |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2185 if (IsAirportTile(t)) { |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2186 StationGfx old_gfx = GetStationGfx(t); |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2187 byte offset = 0; |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2188 for (uint i = 0; i < lengthof(atc); i++) { |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2189 if (old_gfx < atc[i].old_start) { |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2190 SetStationGfx(t, old_gfx - offset); |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2191 break; |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2192 } |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2193 if (old_gfx < atc[i].old_start + atc[i].num_frames) { |
15934
3172190fa127
(svn r20622) -Codechange: unify [GS]et[Statation|Object|Industry|House]AnimationFrame
rubidium <rubidium@openttd.org>
parents:
15933
diff
changeset
|
2194 SetAnimationFrame(t, old_gfx - atc[i].old_start); |
14357
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2195 SetStationGfx(t, atc[i].old_start - offset); |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2196 break; |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2197 } |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2198 offset += atc[i].num_frames - 1; |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2199 } |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2200 } |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2201 } |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2202 } |
8c37cdc73f7f
(svn r18912) -Codechange: free up a bunch of airporttile ids by using the tile animation frame
yexo <yexo@openttd.org>
parents:
14279
diff
changeset
|
2203 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2204 if (IsSavegameVersionBefore(139)) { |
14753
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2205 Train *t; |
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2206 FOR_ALL_TRAINS(t) { |
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2207 /* Copy old GOINGUP / GOINGDOWN flags. */ |
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2208 if (HasBit(t->flags, 1)) { |
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2209 ClrBit(t->flags, 1); |
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2210 SetBit(t->gv_flags, GVF_GOINGUP_BIT); |
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2211 } else if (HasBit(t->flags, 2)) { |
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2212 ClrBit(t->flags, 2); |
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2213 SetBit(t->gv_flags, GVF_GOINGDOWN_BIT); |
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2214 } |
3e27a2798ca0
(svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
terkhen <terkhen@openttd.org>
parents:
14734
diff
changeset
|
2215 } |
14621
562ed276a7d0
(svn r19198) -Codechange: store the size of stations in savegames
yexo <yexo@openttd.org>
parents:
14357
diff
changeset
|
2216 } |
562ed276a7d0
(svn r19198) -Codechange: store the size of stations in savegames
yexo <yexo@openttd.org>
parents:
14357
diff
changeset
|
2217 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2218 if (IsSavegameVersionBefore(140)) { |
14793
c9ea26de660d
(svn r19382) -Fix (r19381): don't break savegame version 139
yexo <yexo@openttd.org>
parents:
14791
diff
changeset
|
2219 Station *st; |
c9ea26de660d
(svn r19382) -Fix (r19381): don't break savegame version 139
yexo <yexo@openttd.org>
parents:
14791
diff
changeset
|
2220 FOR_ALL_STATIONS(st) { |
c9ea26de660d
(svn r19382) -Fix (r19381): don't break savegame version 139
yexo <yexo@openttd.org>
parents:
14791
diff
changeset
|
2221 if (st->airport.tile != INVALID_TILE) { |
14859
304d377a82af
(svn r19455) -Codechange: split all airport information in Station to a seperate class
yexo <yexo@openttd.org>
parents:
14805
diff
changeset
|
2222 st->airport.w = st->airport.GetSpec()->size_x; |
304d377a82af
(svn r19455) -Codechange: split all airport information in Station to a seperate class
yexo <yexo@openttd.org>
parents:
14805
diff
changeset
|
2223 st->airport.h = st->airport.GetSpec()->size_y; |
14793
c9ea26de660d
(svn r19382) -Fix (r19381): don't break savegame version 139
yexo <yexo@openttd.org>
parents:
14791
diff
changeset
|
2224 } |
c9ea26de660d
(svn r19382) -Fix (r19381): don't break savegame version 139
yexo <yexo@openttd.org>
parents:
14791
diff
changeset
|
2225 } |
c9ea26de660d
(svn r19382) -Fix (r19381): don't break savegame version 139
yexo <yexo@openttd.org>
parents:
14791
diff
changeset
|
2226 } |
c9ea26de660d
(svn r19382) -Fix (r19381): don't break savegame version 139
yexo <yexo@openttd.org>
parents:
14791
diff
changeset
|
2227 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2228 if (IsSavegameVersionBefore(141)) { |
15140
8676e88fecb0
(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.
frosch <frosch@openttd.org>
parents:
15089
diff
changeset
|
2229 for (TileIndex t = 0; t < map_size; t++) { |
8676e88fecb0
(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.
frosch <frosch@openttd.org>
parents:
15089
diff
changeset
|
2230 /* Reset tropic zone for VOID tiles, they shall not have any. */ |
8676e88fecb0
(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.
frosch <frosch@openttd.org>
parents:
15089
diff
changeset
|
2231 if (IsTileType(t, MP_VOID)) SetTropicZone(t, TROPICZONE_NORMAL); |
8676e88fecb0
(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.
frosch <frosch@openttd.org>
parents:
15089
diff
changeset
|
2232 } |
15170
432bee68ef70
(svn r19799) -Change: give depots an unique name in the same manner buoys and waypoints are named
rubidium <rubidium@openttd.org>
parents:
15140
diff
changeset
|
2233 |
432bee68ef70
(svn r19799) -Change: give depots an unique name in the same manner buoys and waypoints are named
rubidium <rubidium@openttd.org>
parents:
15140
diff
changeset
|
2234 /* We need to properly number/name the depots. |
432bee68ef70
(svn r19799) -Change: give depots an unique name in the same manner buoys and waypoints are named
rubidium <rubidium@openttd.org>
parents:
15140
diff
changeset
|
2235 * The first step is making sure none of the depots uses the |
432bee68ef70
(svn r19799) -Change: give depots an unique name in the same manner buoys and waypoints are named
rubidium <rubidium@openttd.org>
parents:
15140
diff
changeset
|
2236 * 'default' names, after that we can assign the names. */ |
432bee68ef70
(svn r19799) -Change: give depots an unique name in the same manner buoys and waypoints are named
rubidium <rubidium@openttd.org>
parents:
15140
diff
changeset
|
2237 Depot *d; |
432bee68ef70
(svn r19799) -Change: give depots an unique name in the same manner buoys and waypoints are named
rubidium <rubidium@openttd.org>
parents:
15140
diff
changeset
|
2238 FOR_ALL_DEPOTS(d) d->town_cn = UINT16_MAX; |
432bee68ef70
(svn r19799) -Change: give depots an unique name in the same manner buoys and waypoints are named
rubidium <rubidium@openttd.org>
parents:
15140
diff
changeset
|
2239 |
432bee68ef70
(svn r19799) -Change: give depots an unique name in the same manner buoys and waypoints are named
rubidium <rubidium@openttd.org>
parents:
15140
diff
changeset
|
2240 FOR_ALL_DEPOTS(d) MakeDefaultName(d); |
15140
8676e88fecb0
(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.
frosch <frosch@openttd.org>
parents:
15089
diff
changeset
|
2241 } |
8676e88fecb0
(svn r19769) -Fix [FS#3820]: MV_VOID tiles shall have no tropic zone.
frosch <frosch@openttd.org>
parents:
15089
diff
changeset
|
2242 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2243 if (IsSavegameVersionBefore(142)) { |
15360
22ec7da21bf0
(svn r20003) -Feature [FS#3886]: [NewGRF] var 43 depot build date for railtypes
yexo <yexo@openttd.org>
parents:
15330
diff
changeset
|
2244 Depot *d; |
22ec7da21bf0
(svn r20003) -Feature [FS#3886]: [NewGRF] var 43 depot build date for railtypes
yexo <yexo@openttd.org>
parents:
15330
diff
changeset
|
2245 FOR_ALL_DEPOTS(d) d->build_date = _date; |
22ec7da21bf0
(svn r20003) -Feature [FS#3886]: [NewGRF] var 43 depot build date for railtypes
yexo <yexo@openttd.org>
parents:
15330
diff
changeset
|
2246 } |
22ec7da21bf0
(svn r20003) -Feature [FS#3886]: [NewGRF] var 43 depot build date for railtypes
yexo <yexo@openttd.org>
parents:
15330
diff
changeset
|
2247 |
15846
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2248 /* In old versions it was possible to remove an airport while a plane was |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2249 * taking off or landing. This gives all kind of problems when building |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2250 * another airport in the same station so we don't allow that anymore. |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2251 * For old savegames with such aircraft we just throw them in the air and |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2252 * treat the aircraft like they were flying already. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2253 if (IsSavegameVersionBefore(146)) { |
15846
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2254 Aircraft *v; |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2255 FOR_ALL_AIRCRAFT(v) { |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2256 if (!v->IsNormalAircraft()) continue; |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2257 Station *st = GetTargetAirportIfValid(v); |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2258 if (st == NULL && v->state != FLYING) { |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2259 v->state = FLYING; |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2260 UpdateAircraftCache(v); |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2261 AircraftNextAirportPos_and_Order(v); |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2262 /* get aircraft back on running altitude */ |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2263 if ((v->vehstatus & VS_CRASHED) == 0) SetAircraftPosition(v, v->x_pos, v->y_pos, GetAircraftFlyingAltitude(v)); |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2264 } |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2265 } |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2266 } |
c7db31e8c68a
(svn r20528) -Fix: in old savegames aircraft can have an invalid state
yexo <yexo@openttd.org>
parents:
15807
diff
changeset
|
2267 |
15933
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2268 /* Move the animation frame to the same location (m7) for all objects. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2269 if (IsSavegameVersionBefore(147)) { |
15933
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2270 for (TileIndex t = 0; t < map_size; t++) { |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2271 switch (GetTileType(t)) { |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2272 case MP_HOUSE: |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2273 if (GetHouseType(t) >= NEW_HOUSE_OFFSET) { |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2274 uint per_proc = _me[t].m7; |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2275 _me[t].m7 = GB(_m[t].m6, 2, 6) | (GB(_m[t].m3, 5, 1) << 6); |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2276 SB(_m[t].m3, 5, 1, 0); |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2277 SB(_m[t].m6, 2, 6, min(per_proc, 63)); |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2278 } |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2279 break; |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2280 |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2281 case MP_INDUSTRY: { |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2282 uint rand = _me[t].m7; |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2283 _me[t].m7 = _m[t].m3; |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2284 _m[t].m3 = rand; |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2285 break; |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2286 } |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2287 |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2288 case MP_OBJECT: |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2289 _me[t].m7 = _m[t].m3; |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2290 _m[t].m3 = 0; |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2291 break; |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2292 |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2293 default: |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2294 /* For stations/airports it's already at m7 */ |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2295 break; |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2296 } |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2297 } |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2298 } |
8ac5258d7680
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
rubidium <rubidium@openttd.org>
parents:
15908
diff
changeset
|
2299 |
15970
8aa446dec4e5
(svn r20658) -Codechange: add the colour of an object to the object instance
rubidium <rubidium@openttd.org>
parents:
15968
diff
changeset
|
2300 /* Add (random) colour to all objects. */ |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2301 if (IsSavegameVersionBefore(148)) { |
15970
8aa446dec4e5
(svn r20658) -Codechange: add the colour of an object to the object instance
rubidium <rubidium@openttd.org>
parents:
15968
diff
changeset
|
2302 Object *o; |
8aa446dec4e5
(svn r20658) -Codechange: add the colour of an object to the object instance
rubidium <rubidium@openttd.org>
parents:
15968
diff
changeset
|
2303 FOR_ALL_OBJECTS(o) { |
8aa446dec4e5
(svn r20658) -Codechange: add the colour of an object to the object instance
rubidium <rubidium@openttd.org>
parents:
15968
diff
changeset
|
2304 Owner owner = GetTileOwner(o->location.tile); |
8aa446dec4e5
(svn r20658) -Codechange: add the colour of an object to the object instance
rubidium <rubidium@openttd.org>
parents:
15968
diff
changeset
|
2305 o->colour = (owner == OWNER_NONE) ? Random() & 0xF : Company::Get(owner)->livery->colour1; |
8aa446dec4e5
(svn r20658) -Codechange: add the colour of an object to the object instance
rubidium <rubidium@openttd.org>
parents:
15968
diff
changeset
|
2306 } |
8aa446dec4e5
(svn r20658) -Codechange: add the colour of an object to the object instance
rubidium <rubidium@openttd.org>
parents:
15968
diff
changeset
|
2307 } |
8aa446dec4e5
(svn r20658) -Codechange: add the colour of an object to the object instance
rubidium <rubidium@openttd.org>
parents:
15968
diff
changeset
|
2308 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2309 if (IsSavegameVersionBefore(149)) { |
16024
6b3718ff071d
(svn r20717) -Fix [FS#4103]: water class was not set for stations
yexo <yexo@openttd.org>
parents:
15970
diff
changeset
|
2310 for (TileIndex t = 0; t < map_size; t++) { |
6b3718ff071d
(svn r20717) -Fix [FS#4103]: water class was not set for stations
yexo <yexo@openttd.org>
parents:
15970
diff
changeset
|
2311 if (!IsTileType(t, MP_STATION)) continue; |
6b3718ff071d
(svn r20717) -Fix [FS#4103]: water class was not set for stations
yexo <yexo@openttd.org>
parents:
15970
diff
changeset
|
2312 if (!IsBuoy(t) && !IsOilRig(t) && !(IsDock(t) && GetTileSlope(t, NULL) == SLOPE_FLAT)) { |
6b3718ff071d
(svn r20717) -Fix [FS#4103]: water class was not set for stations
yexo <yexo@openttd.org>
parents:
15970
diff
changeset
|
2313 SetWaterClass(t, WATER_CLASS_INVALID); |
6b3718ff071d
(svn r20717) -Fix [FS#4103]: water class was not set for stations
yexo <yexo@openttd.org>
parents:
15970
diff
changeset
|
2314 } |
6b3718ff071d
(svn r20717) -Fix [FS#4103]: water class was not set for stations
yexo <yexo@openttd.org>
parents:
15970
diff
changeset
|
2315 } |
16120
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2316 |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2317 /* Waypoints with custom name may have a non-unique town_cn, |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2318 * renumber those. First set all affected waypoints to the |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2319 * highest possible number to get them numbered in the |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2320 * order they have in the pool. */ |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2321 Waypoint *wp; |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2322 FOR_ALL_WAYPOINTS(wp) { |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2323 if (wp->name != NULL) wp->town_cn = UINT16_MAX; |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2324 } |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2325 |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2326 FOR_ALL_WAYPOINTS(wp) { |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2327 if (wp->name != NULL) MakeDefaultName(wp); |
9c19ce78d8ec
(svn r20816) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
rubidium <rubidium@openttd.org>
parents:
16024
diff
changeset
|
2328 } |
16024
6b3718ff071d
(svn r20717) -Fix [FS#4103]: water class was not set for stations
yexo <yexo@openttd.org>
parents:
15970
diff
changeset
|
2329 } |
6b3718ff071d
(svn r20717) -Fix [FS#4103]: water class was not set for stations
yexo <yexo@openttd.org>
parents:
15970
diff
changeset
|
2330 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2331 if (IsSavegameVersionBefore(152)) { |
16455
5eec51f031a9
(svn r21171) -Change: Reset industry build data at game start or load.
alberth <alberth@openttd.org>
parents:
16437
diff
changeset
|
2332 _industry_builder.Reset(); // Initialize industry build data. |
16437
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2333 |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2334 /* The moment vehicles go from hidden to visible changed. This means |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2335 * that vehicles don't always get visible anymore causing things to |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2336 * get messed up just after loading the savegame. This fixes that. */ |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2337 Vehicle *v; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2338 FOR_ALL_VEHICLES(v) { |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2339 /* Is the vehicle in a tunnel? */ |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2340 if (!IsTunnelTile(v->tile)) continue; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2341 |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2342 /* Is the vehicle actually at a tunnel entrance/exit? */ |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2343 TileIndex vtile = TileVirtXY(v->x_pos, v->y_pos); |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2344 if (!IsTunnelTile(vtile)) continue; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2345 |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2346 /* Are we actually in this tunnel? Or maybe a lower tunnel? */ |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2347 if (GetSlopeZ(v->x_pos, v->y_pos) != v->z_pos) continue; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2348 |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2349 /* What way are we going? */ |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2350 const DiagDirection dir = GetTunnelBridgeDirection(vtile); |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2351 const DiagDirection vdir = DirToDiagDir(v->direction); |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2352 |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2353 /* Have we passed the visibility "switch" state already? */ |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2354 byte pos = (DiagDirToAxis(vdir) == AXIS_X ? v->x_pos : v->y_pos) & TILE_UNIT_MASK; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2355 byte frame = (vdir == DIAGDIR_NE || vdir == DIAGDIR_NW) ? TILE_SIZE - 1 - pos : pos; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2356 extern const byte _tunnel_visibility_frame[DIAGDIR_END]; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2357 |
16471
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2358 /* Should the vehicle be hidden or not? */ |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2359 bool hidden; |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2360 if (dir == vdir) { // Entering tunnel |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2361 hidden = frame >= _tunnel_visibility_frame[dir]; |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2362 } else if (dir == ReverseDiagDir(vdir)) { // Leaving tunnel |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2363 hidden = frame < TILE_SIZE - _tunnel_visibility_frame[dir]; |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2364 } else { // Something freaky going on? |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2365 NOT_REACHED(); |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2366 } |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2367 v->tile = vtile; |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2368 |
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2369 if (hidden) { |
16437
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2370 v->vehstatus |= VS_HIDDEN; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2371 |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2372 switch (v->type) { |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2373 case VEH_TRAIN: Train::From(v)->track = TRACK_BIT_WORMHOLE; break; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2374 case VEH_ROAD: RoadVehicle::From(v)->state = RVSB_WORMHOLE; break; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2375 default: NOT_REACHED(); |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2376 } |
16471
0916f941c60e
(svn r21195) -Fix [FS#4230] (r21135): in some corner cases the savegame conversion didn't do the right thing
rubidium <rubidium@openttd.org>
parents:
16455
diff
changeset
|
2377 } else { |
16437
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2378 v->vehstatus &= ~VS_HIDDEN; |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2379 |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2380 switch (v->type) { |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2381 case VEH_TRAIN: Train::From(v)->track = DiagDirToDiagTrackBits(vdir); break; |
16651
73ff1504a61a
(svn r21382) -Fix (r21153) [FS#4290]: the road vehicle's frame wasn't properly set upon savegame conversion *if* the vehicle would be hidden, but isn't going to be hidden anymore after the conversion
rubidium <rubidium@openttd.org>
parents:
16571
diff
changeset
|
2382 case VEH_ROAD: RoadVehicle::From(v)->state = DiagDirToDiagTrackdir(vdir); RoadVehicle::From(v)->frame = frame; break; |
16437
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2383 default: NOT_REACHED(); |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2384 } |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2385 } |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2386 } |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2387 } |
662a2210afac
(svn r21153) -Change: unify the moment trains/road vehicles become (un)visible when entering/leaving a tunnel. As a side effect some tunnel related glitches are gone.
rubidium <rubidium@openttd.org>
parents:
16407
diff
changeset
|
2388 |
16556
27c6e2c99511
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
alberth <alberth@openttd.org>
parents:
16554
diff
changeset
|
2389 if (IsSavegameVersionBefore(153)) { |
16537
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2390 RoadVehicle *rv; |
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2391 FOR_ALL_ROADVEHICLES(rv) { |
16571
3ef305c397f1
(svn r21299) -Fix (r21263): a road vehicle in a depot or wormhole could get into an incorrect state upon savegame conversion causing it to break up later in the game
rubidium <rubidium@openttd.org>
parents:
16556
diff
changeset
|
2392 if (rv->state == RVSB_IN_DEPOT || rv->state == RVSB_WORMHOLE) continue; |
3ef305c397f1
(svn r21299) -Fix (r21263): a road vehicle in a depot or wormhole could get into an incorrect state upon savegame conversion causing it to break up later in the game
rubidium <rubidium@openttd.org>
parents:
16556
diff
changeset
|
2393 |
16537
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2394 bool loading = rv->current_order.IsType(OT_LOADING) || rv->current_order.IsType(OT_LEAVESTATION); |
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2395 if (HasBit(rv->state, RVS_IN_ROAD_STOP)) { |
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2396 extern const byte _road_stop_stop_frame[]; |
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2397 SB(rv->state, RVS_ENTERED_STOP, 1, loading || rv->frame > _road_stop_stop_frame[rv->state - RVSB_IN_ROAD_STOP + (_settings_game.vehicle.road_side << RVS_DRIVE_SIDE)]); |
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2398 } else if (HasBit(rv->state, RVS_IN_DT_ROAD_STOP)) { |
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2399 SB(rv->state, RVS_ENTERED_STOP, 1, loading || rv->frame > RVC_DRIVE_THROUGH_STOP_FRAME); |
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2400 } |
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2401 } |
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2402 } |
abfc3321231b
(svn r21263) -Fix [FS#3935]: under some circumstances two vehicles could leave a non-drive through road stop at once
rubidium <rubidium@openttd.org>
parents:
16471
diff
changeset
|
2403 |
16771
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2404 if (IsSavegameVersionBefore(156)) { |
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2405 /* The train's pathfinder lost flag got moved. */ |
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2406 Train *t; |
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2407 FOR_ALL_TRAINS(t) { |
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2408 if (!HasBit(t->flags, 5)) continue; |
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2409 |
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2410 ClrBit(t->flags, 5); |
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2411 SetBit(t->vehicle_flags, VF_PATHFINDER_LOST); |
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2412 } |
16992
e364b524e15a
(svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company
rubidium <rubidium@openttd.org>
parents:
16982
diff
changeset
|
2413 |
e364b524e15a
(svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company
rubidium <rubidium@openttd.org>
parents:
16982
diff
changeset
|
2414 /* Introduced terraform/clear limits. */ |
e364b524e15a
(svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company
rubidium <rubidium@openttd.org>
parents:
16982
diff
changeset
|
2415 Company *c; |
e364b524e15a
(svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company
rubidium <rubidium@openttd.org>
parents:
16982
diff
changeset
|
2416 FOR_ALL_COMPANIES(c) { |
e364b524e15a
(svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company
rubidium <rubidium@openttd.org>
parents:
16982
diff
changeset
|
2417 c->terraform_limit = _settings_game.construction.terraform_frame_burst << 16; |
e364b524e15a
(svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company
rubidium <rubidium@openttd.org>
parents:
16982
diff
changeset
|
2418 c->clear_limit = _settings_game.construction.clear_frame_burst << 16; |
e364b524e15a
(svn r21728) -Fix/Feature [FS#4331]: (configurably) limit amount of tiles that can be cleared/terraformed by a company
rubidium <rubidium@openttd.org>
parents:
16982
diff
changeset
|
2419 } |
16771
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2420 } |
86bdc4c9b81e
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
rubidium <rubidium@openttd.org>
parents:
16651
diff
changeset
|
2421 |
13875
052c69fbc76b
(svn r18404) -Codechange: link drive through stops better together
rubidium <rubidium@openttd.org>
parents:
13859
diff
changeset
|
2422 /* Road stops is 'only' updating some caches */ |
052c69fbc76b
(svn r18404) -Codechange: link drive through stops better together
rubidium <rubidium@openttd.org>
parents:
13859
diff
changeset
|
2423 AfterLoadRoadStops(); |
11441
9af29ff772fd
(svn r15799) -Codechange: Save rail type label list to savegame and perform mapping on load if necessary.
peter1138 <peter1138@openttd.org>
parents:
11368
diff
changeset
|
2424 AfterLoadLabelMaps(); |
9af29ff772fd
(svn r15799) -Codechange: Save rail type label list to savegame and perform mapping on load if necessary.
peter1138 <peter1138@openttd.org>
parents:
11368
diff
changeset
|
2425 |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2426 GamelogPrintDebug(1); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2427 |
12749
27a938bed307
(svn r17215) -Cleanup: remove unused return value
yexo <yexo@openttd.org>
parents:
12669
diff
changeset
|
2428 InitializeWindowsAndCaches(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2429 /* Restore the signals */ |
11948
ad1ecf6b26e4
(svn r16351) -Fix (r14773): signal handler could end in endless loop
smatz <smatz@openttd.org>
parents:
11946
diff
changeset
|
2430 ResetSignalHandlers(); |
12749
27a938bed307
(svn r17215) -Cleanup: remove unused return value
yexo <yexo@openttd.org>
parents:
12669
diff
changeset
|
2431 return true; |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2432 } |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2433 |
15620
f8e9a3f0c140
(svn r20283) -Codechange: Unify start of doygen comments.
frosch <frosch@openttd.org>
parents:
15618
diff
changeset
|
2434 /** |
f8e9a3f0c140
(svn r20283) -Codechange: Unify start of doygen comments.
frosch <frosch@openttd.org>
parents:
15618
diff
changeset
|
2435 * Reload all NewGRF files during a running game. This is a cut-down |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2436 * version of AfterLoadGame(). |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2437 * XXX - We need to reset the vehicle position hash because with a non-empty |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2438 * hash AfterLoadVehicles() will loop infinitely. We need AfterLoadVehicles() |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2439 * to recalculate vehicle data as some NewGRF vehicle sets could have been |
15623
c62577640878
(svn r20286) -Codechange: Unify end of doxygen comments.
frosch <frosch@openttd.org>
parents:
15620
diff
changeset
|
2440 * removed or added and changed statistics |
c62577640878
(svn r20286) -Codechange: Unify end of doxygen comments.
frosch <frosch@openttd.org>
parents:
15620
diff
changeset
|
2441 */ |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2442 void ReloadNewGRFData() |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2443 { |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2444 /* reload grf data */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2445 GfxLoadSprites(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2446 LoadStringWidthTable(); |
12940
1b090e0c4f93
(svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
frosch <frosch@openttd.org>
parents:
12826
diff
changeset
|
2447 RecomputePrices(); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2448 /* reload vehicles */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2449 ResetVehiclePosHash(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2450 AfterLoadVehicles(false); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2451 StartupEngines(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2452 SetCachedEngineCounts(); |
12472
604a2cfc77ab
(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.
rubidium <rubidium@openttd.org>
parents:
12471
diff
changeset
|
2453 /* update station graphics */ |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2454 AfterLoadStations(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2455 /* Check and update house and town values */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2456 UpdateHousesAndTowns(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2457 /* Update livery selection windows */ |
12380
4be044af31ec
(svn r16809) -Fix [FS#3021](r13096): automatic resizing of SelectCompanyLiveryWindow wasn't working as expected
smatz <smatz@openttd.org>
parents:
12361
diff
changeset
|
2458 for (CompanyID i = COMPANY_FIRST; i < MAX_COMPANIES; i++) InvalidateWindowData(WC_COMPANY_COLOUR, i); |
10571
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2459 /* redraw the whole screen */ |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2460 MarkWholeScreenDirty(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2461 CheckTrainsLengths(); |
b6779abf2e96
(svn r14828) -Codechange: move most of save/load-specific code to separate files
smatz <smatz@openttd.org>
parents:
diff
changeset
|
2462 } |