Commit Graph

2088 Commits

Author SHA1 Message Date
Jonathan G Rennison
2e6b4cc961 Merge branch 'reverse_at_waypoint' into jgrpp
Conflicts:
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/train_cmd.cpp
2015-10-29 00:59:42 +00:00
Jonathan G Rennison
7bcd090a0f Add reverse at waypoint orders.
The train will reverse when its tail is within the waypoint tile.
This is useful for reversing on train en-route, without creating
dedicated reversing sidings or platforms.
2015-10-28 23:50:22 +00:00
Jonathan G Rennison
b48a01f233 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/settings_type.h
2015-10-25 21:50:14 +00:00
Jonathan G Rennison
60a677692e Merge branch 'order_occupancy-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/settings_gui.cpp
	src/table/company_settings.ini
2015-10-25 21:47:07 +00:00
Jonathan G Rennison
26d32269a3 Make auto TT separation rate a company setting.
Move auto TT by default setting to PLYX chunk.
2015-10-25 21:41:25 +00:00
Jonathan G Rennison
a380573c32 Merge branch 'save_ext' into auto_timetables-sx 2015-10-25 21:41:20 +00:00
Jonathan G Rennison
6d263226d8 Move order occupancy smoothness to company settings. 2015-10-25 21:37:27 +00:00
Jonathan G Rennison
8001d86350 Merge branch 'save_ext' into order_occupancy-sx 2015-10-25 21:36:21 +00:00
Jonathan G Rennison
e606a847c6 Add an un-ordered chunk for extra company settings: PLYX.
This is similar to the PATX chunk.
Minor refactoring to enable some code sharing between two chunks.
Fix MakeSettingsPatxList always regenerating cache.
Update documentation of PATX chunk structure.
2015-10-25 21:35:40 +00:00
Jonathan G Rennison
66cd454c37 Merge branch 'day_length-sx' into jgrpp 2015-09-27 23:18:33 +01:00
Jonathan G Rennison
cce270d780 Merge branch 'day_length' into day_length-sx 2015-09-27 23:12:23 +01:00
Jonathan G Rennison
f03cd98d04 Check/print tick skip counter in desync and random logging. 2015-09-27 23:12:00 +01:00
Jonathan G Rennison
361b8b4540 Merge branch 'extra_large_maps-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
2015-09-12 14:19:26 +01:00
Jonathan G Rennison
421b9034e2 Add an extended version feature for map sizes > 8kx8k.
This is to prevent earlier versions from trying to load the savegame
and aborting.
2015-09-12 14:17:37 +01:00
Jonathan G Rennison
72dadf7c6b Merge branch 'save_ext' into extra_large_maps-sx 2015-09-12 14:15:47 +01:00
Jonathan G Rennison
d6395b97a7 Enable extended feature versions for saving to be set at run time. 2015-09-12 14:15:32 +01:00
Jonathan G Rennison
f27ca88596 Show error message instead of aborting when loading an invalid map size. 2015-09-12 13:33:35 +01:00
Jonathan G Rennison
8b994e255d Merge branch 'extra_large_maps-sx' into jgrpp
Conflicts:
	src/saveload/saveload.cpp
2015-09-11 22:50:35 +01:00
Jonathan G Rennison
86dea90c4f save_ext: Initial support for save/load of RIFF chunk sizes > 28 bits.
Add a chunk extension header with a flag for increased RIFF size.
2015-09-11 22:37:36 +01:00
Jonathan G Rennison
ec08a32c94 Perform SpringPP airport checks before calling AfterLoadVehicles.
This is because AfterLoadVehicles may indirectly check airport
properties via the NewGRF code.

Defer missing GRF error message output until the end of AfterLoadGame
to avoid obscuring any earlier errors.
2015-09-06 19:48:43 +01:00
Jonathan G Rennison
e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
2015-09-03 23:30:13 +01:00
Jonathan G Rennison
42370dc28d Add company setting to auto-enable auto timetables for new vehicles.
Default: off.
2015-09-03 23:27:26 +01:00
Jonathan G Rennison
5108a71240 SpringPP load: remove wait for cargo orders. 2015-09-02 21:25:33 +01:00
Jonathan G Rennison
3dec3242cc Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
2015-09-02 21:09:25 +01:00
Jonathan G Rennison
c751bba17c Bump SLXI tracerestrict version due to reserve through new feature. 2015-09-02 21:07:08 +01:00
Jonathan G Rennison
8f4c216b3f Merge branch 'tracerestrict' into tracerestrict-sx 2015-09-02 21:03:14 +01:00
Jonathan G Rennison
73b69c5594 Validate type of all instructions, log validation failures at load.
The validator now checks that the type of conditional instructions
is known.
On a validation failure, the load code now outputs a corrupt savegame
message, with the validation error message and a program dump,
instead of using an assertion.
2015-09-02 20:51:30 +01:00
Jonathan G Rennison
2edfccd187 SpringPP load: Fix loading when day-length > 1
Adjust value of _date_fract.
2015-08-31 19:42:34 +01:00
Jonathan G Rennison
44a41ba13e Fix traffic light removal not deleting animated tile. 2015-08-31 09:58:42 +01:00
Jonathan G Rennison
bbc131ce47 Merge branch 'jgrpp' into save_ext_spp
Conflicts:
	src/saveload/order_sl.cpp
2015-08-26 23:26:18 +01:00
Jonathan G Rennison
8357b911e5 Merge branch 'more_cond_orders-sx' into jgrpp
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
2015-08-26 23:24:41 +01:00
Jonathan G Rennison
77bcd5f2c2 More conditional orders: Extended save/load changes. 2015-08-26 23:15:33 +01:00
Jonathan G Rennison
0372bfcda7 Merge branch 'save_ext' into more_cond_orders-sx
Conflicts:
	src/saveload/saveload.cpp
2015-08-26 23:08:51 +01:00
Jonathan G Rennison
ffdd845b1c Merge branch 'master' into more_cond_orders
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/saveload.cpp
	src/saveload/saveload.h
2015-08-26 22:51:47 +01:00
patch-import
c757a97214 Import more conditional orders patch
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
2015-08-26 22:28:20 +01:00
Jonathan G Rennison
64a6f5c0d4 Merge branch 'jgrpp' into save_ext_spp 2015-08-21 23:00:57 +01:00
Jonathan G Rennison
88d45e5e2c Clear rail ageing data on load. 2015-08-19 19:09:25 +01:00
Jonathan G Rennison
96ccd9333a Clear PAX stations/signals and traffic lights on load.
This clears the tracerestrict bit if there are no mappings on a tile.
2015-08-19 18:55:02 +01:00
Jonathan G Rennison
ba8d8d99b8 Add support for loading SpringPP savegame versions 221 and 222.
These correspond to versions from v2.1.108 and v2.1.147.
The oil rig airport type bug is fixed as of version 221.
The oil rig type has been moved, but this is not a problem as
the afterload code already remaps it to the correct value.
The cost scaling issue also seems to have been mostly fixed
as of version 221.
2015-08-18 23:08:34 +01:00
Jonathan G Rennison
279eac6e57 Reject SpringPP games with huge airports or helis approaching oil rigs.
Huge airports are not supported.
Annoyingly SpringPP has a bug where it uses the same ID for
AT_INTERCONTINENTAL2 and AT_OILRIG.
Consequently any aircraft approaching an oil rig in an SPP game
will be using the wrong aircraft movement data, and this will go
badly wrong as soon as the game is unpaused.
2015-08-17 21:41:05 +01:00
Jonathan G Rennison
d3bab84374 Apply rename/typo fix of XSLFI_IMPROVED_BREAKDOWNS. 2015-08-17 20:08:47 +01:00
Jonathan G Rennison
74e5d97fcb Merge branch 'save_ext' into signal_tunnels_bridges-sx 2015-08-16 17:33:29 +01:00
Jonathan G Rennison
880d455ea9 Merge branch 'progsig-sx' into jgrpp 2015-08-16 16:58:23 +01:00
Jonathan G Rennison
0693d3678a Progsig: Fix some benign compiler warnings and whitespace issues. 2015-08-16 16:57:24 +01:00
Jonathan G Rennison
9283ae38df Merge branch 'save_ext' into progsig-sx 2015-08-16 16:47:12 +01:00
Jonathan G Rennison
034279c0e8 Merge branch 'save_ext' into jgrpp 2015-08-16 14:36:26 +01:00
Jonathan G Rennison
a8cc81d054 Initialiser list fixes for legacy compilers. 2015-08-16 14:36:07 +01:00
Jonathan G Rennison
6d695a1426 Merge branch 'master' into improved_breakdowns 2015-08-15 23:34:48 +01:00
Jonathan G Rennison
9716026809 Merge branch 'jgrpp' into save_ext_spp 2015-08-15 15:24:21 +01:00
Jonathan G Rennison
6b0e63e054 Merge branch 'improved_breakdowns-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
2015-08-09 23:59:58 +01:00