Jonathan G Rennison
6452b0fe02
Merge branch 'departure-boards-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/window_type.h
2015-08-02 18:23:25 +01:00
Jonathan G Rennison
0afc054bff
Merge branch 'adjacent_crossings-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
2015-08-02 18:18:41 +01:00
Jonathan G Rennison
78b2e5babb
Merge branches 'upgrade_airport' and 'vehicle_group_info' into jgrpp
2015-08-02 18:17:44 +01:00
Jonathan G Rennison
2bcbeea011
Merge branch 'progsig-sx' into jgrpp
...
Conflicts:
src/command.cpp
src/command_type.h
src/lang/english.txt
src/rail_cmd.cpp
src/rail_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/widgets/rail_widget.h
src/window_type.h
2015-08-02 18:15:18 +01:00
Jonathan G Rennison
de76316634
Merge branch 'tracerestrict-sx' into jgrpp
2015-08-02 17:59:10 +01:00
Jonathan G Rennison
09be8afd8d
Adjacent crossings: add setting (in PATX), add info to SLXI chunk.
2015-08-02 17:49:25 +01:00
patch-import
45b5145396
Add group info patch
...
Fix whitespace, add NOSAVE comment in vehicle struct
http://www.tt-forums.net/viewtopic.php?f=33&t=72855
2015-08-02 12:35:18 +01:00
Jonathan G Rennison
08dc95fea1
Add town cargo patch SLXI/PATX code.
...
Update setting string.
2015-08-02 00:59:40 +01:00
Jonathan G Rennison
09aa29de8b
Add signals on bridges/tunnels SLXI info, move setting to PATX.
2015-08-01 21:41:44 +01:00
Jonathan G Rennison
6c81f8f35b
Add departure boards and timetable tick status to SLXI info.
...
Implementing converting timetable start date to/from ticks/days in
afterload code.
2015-08-01 21:07:14 +01:00
Jonathan G Rennison
de14c210db
Add progsigs info to SLXI chunk, move setting to PATX chunk.
2015-08-01 18:21:34 +01:00
Jonathan G Rennison
3a3280e536
Merge branch 'save_ext' into progsig-sx
2015-08-01 18:17:30 +01:00
Jonathan G Rennison
5d680d9154
Implement version setting in SlXvSetCurrentState
...
Call in ClearSaveLoadState
2015-08-01 18:03:07 +01:00
Jonathan G Rennison
b1d8bcfe35
Merge branch 'save_ext' into progsig-sx
...
Conflicts:
source.list
src/saveload/saveload.cpp
2015-08-01 17:21:38 +01:00
patch-import
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
2015-08-01 17:06:43 +01:00
Jonathan G Rennison
d99ebb4976
Add tracerestrict SLXI version info and special case loading from
...
tracerestrict branch without SLXI.
2015-08-01 13:04:53 +01:00
Jonathan G Rennison
bda3343107
Merge branch 'save_ext' into tracerestrict-sx
...
Conflicts:
src/saveload/saveload.cpp
2015-08-01 13:03:01 +01:00
Jonathan G Rennison
bde094fe01
Initial implementation of SLXI chunk save/load
2015-08-01 12:58:53 +01:00
Jonathan G Rennison
a3980dc6ba
Move SlRead/SlWrite functions to saveload.h
...
Add SlGetBytesRead and SlGetBytesWritten functions.
2015-08-01 12:26:22 +01:00
Jonathan G Rennison
4508cfbf93
Add format-style versions of SlError and SlErrorCorrupt.
2015-08-01 12:26:22 +01:00
Jonathan G Rennison
17e8693e62
Initial stubs for extending the save/load version checking/upgrade code,
...
with support for tests on individually versioned features as well as
savegame versions.
This is mainly for improved handling of features added to patchpacks.
The current status-quo of picking a random number for the savegame
version when releasing a patch breaks loading of savegames from newer
trunk savegame versions, with or without the same patch applied, as
savegame upgrade code is not run, which can also lead to crashes on load.
Instead don't change the savegame version (but set the high bit to
keep trunk versions away), but instead include the versions of individual
features using a separate mechanism.
2015-08-01 12:26:22 +01:00
Jonathan G Rennison
3dd51e96b8
Bulk documentation update, and a few style fixes.
2015-07-28 01:36:52 +01:00
Jonathan G Rennison
5f1b148cf9
Initial minimal working tracerestrict implementation.
...
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
2015-07-28 01:36:52 +01:00
frosch
c5a4b89915
(svn r27320) -Codechange: Do not drop order backups when loading a savegame for replaying.
2015-06-27 11:46:41 +00:00
frosch
fa83524eb4
(svn r27291) -Fix (r27278) [FS#6303]: Some savegame data was discarded again during loading.
2015-05-21 18:59:11 +00:00
frosch
17d9b77db6
(svn r27278) -Fix: Handle savegames with an unexpected amount of industry-builder or NewGRF entity-mapping more gracefully.
2015-05-09 10:04:50 +00:00
frosch
c9e9dacc6b
(svn r27243) -Fix (r26816) [FS#6285]: Duplicate frees due to pool item classes not having copy constructors.
2015-04-23 20:07:07 +00:00
frosch
2edbc72ebd
(svn r27192) -Change: heading for 1.6 now
2015-03-17 20:33:44 +00:00
frosch
a14b836bf2
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
2015-03-07 18:27:01 +00:00
rubidium
0c2f4bdc2b
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
2014-10-15 18:31:37 +00:00
rubidium
660a95e5d2
(svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments
2014-10-12 18:41:53 +00:00
peter1138
39fa9d2127
(svn r26978) -Fix (r23609): Typo in game script warning message.
2014-10-08 16:34:52 +00:00
rubidium
b50c649405
(svn r26881) -Codechange: bump the savegame version
2014-09-21 11:28:29 +00:00
rubidium
ab3660278a
(svn r26880) -Add: stub settings for limiting bridge and map height
2014-09-21 11:27:34 +00:00
rubidium
dc2b4f2498
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
2014-09-21 11:24:51 +00:00
rubidium
f3b79480ed
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
2014-09-21 11:23:33 +00:00
rubidium
173a234951
(svn r26876) -Codechange: move 'has bride above' data from m6 to type
2014-09-21 11:20:11 +00:00
rubidium
f82c07b582
(svn r26875) -Codechange: move TropicZone information from m6 to type
2014-09-21 11:18:10 +00:00
rubidium
337af973b0
(svn r26873) -Change: split type_height into a type and height array (ic111)
2014-09-21 11:14:58 +00:00
rubidium
3dfb423446
(svn r26872) -Change: give the disaster vehicles the same treatment as aircraft in r26866; make the ascend and descend if needed to cross high mountains (based on patch by ic111)
2014-09-21 11:12:42 +00:00
rubidium
39ded38c01
(svn r26866) -Change: make aircraft ascend/descend when they are too close to the ground or too far away (based on patch by ic111)
2014-09-21 06:35:34 +00:00
rubidium
8ab4f746f2
(svn r26864) -Codechange: bring a bit more OO into the disaster vehicles
2014-09-20 15:46:44 +00:00
rubidium
ac269a3f08
(svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class
2014-09-20 15:31:26 +00:00
rubidium
c225276a7a
(svn r26819) -Fix [FS#6112] (r26787): trying to delete just loaded objects that had not yet resolved their references caused a crash upon savegame load (only when loading a game from a server, e.g. joining MP)
2014-09-14 15:11:33 +00:00
frosch
a7678c367e
(svn r26816) -Fix [FS#6109]: Properly zero-initialise data in _temp_engine.
2014-09-13 14:46:03 +00:00
alberth
44d2f6a988
(svn r26802) -Add: Command to set visibility of an engine for a company (based on patch by Juanjo).
2014-09-07 16:12:58 +00:00
frosch
d2ec27c6c4
(svn r26787) -Fix (r20547): Loading a game with order backups leaked Orders and left unreachable items in the pool.
2014-09-07 13:52:20 +00:00
rubidium
d214ca2c7d
(svn r26753) -Fix: desync due to not always properly restoring game state from the savegame
2014-08-22 17:11:59 +00:00
rubidium
a1f31b735a
(svn r26700) -Fix [FS#6066]: incorrect saving of order backups
2014-07-21 18:03:32 +00:00
fonsinchen
bdde95513a
(svn r26650) -Fix [FS#6041]: Support save/load chunk lengths of up to (1 << 32) - 1
2014-06-17 06:13:38 +00:00
