Jonathan G Rennison
5108a71240
SpringPP load: remove wait for cargo orders.
9 years ago
Jonathan G Rennison
3dec3242cc
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
Jonathan G Rennison
c751bba17c
Bump SLXI tracerestrict version due to reserve through new feature.
9 years ago
Jonathan G Rennison
8f4c216b3f
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
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.
9 years ago
Jonathan G Rennison
2edfccd187
SpringPP load: Fix loading when day-length > 1
...
Adjust value of _date_fract.
9 years ago
Jonathan G Rennison
44a41ba13e
Fix traffic light removal not deleting animated tile.
9 years ago
Jonathan G Rennison
bbc131ce47
Merge branch 'jgrpp' into save_ext_spp
...
Conflicts:
src/saveload/order_sl.cpp
9 years ago
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
9 years ago
Jonathan G Rennison
77bcd5f2c2
More conditional orders: Extended save/load changes.
9 years ago
Jonathan G Rennison
0372bfcda7
Merge branch 'save_ext' into more_cond_orders-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
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
9 years ago
patch-import
c757a97214
Import more conditional orders patch
...
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
9 years ago
Jonathan G Rennison
64a6f5c0d4
Merge branch 'jgrpp' into save_ext_spp
9 years ago
Jonathan G Rennison
88d45e5e2c
Clear rail ageing data on load.
9 years ago
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.
9 years ago
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.
9 years ago
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.
9 years ago
Jonathan G Rennison
d3bab84374
Apply rename/typo fix of XSLFI_IMPROVED_BREAKDOWNS.
9 years ago
Jonathan G Rennison
880d455ea9
Merge branch 'progsig-sx' into jgrpp
9 years ago
Jonathan G Rennison
0693d3678a
Progsig: Fix some benign compiler warnings and whitespace issues.
9 years ago
Jonathan G Rennison
9283ae38df
Merge branch 'save_ext' into progsig-sx
9 years ago
Jonathan G Rennison
034279c0e8
Merge branch 'save_ext' into jgrpp
9 years ago
Jonathan G Rennison
a8cc81d054
Initialiser list fixes for legacy compilers.
9 years ago
Jonathan G Rennison
9716026809
Merge branch 'jgrpp' into save_ext_spp
9 years ago
Jonathan G Rennison
6b0e63e054
Merge branch 'improved_breakdowns-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
Jonathan G Rennison
15f3abf47d
Fix typo in save/load ext feature enum name for improved breakdown.
9 years ago
Jonathan G Rennison
f0fecda985
Merge branch 'order_occupancy-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
9 years ago
Jonathan G Rennison
fdce64ddae
Save/load changes for order occupancy
9 years ago
Jonathan G Rennison
52c07d1f51
Merge branch 'save_ext' into order_occupancy-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison
117599ec7f
Order occupancy: Add column to orders GUI to show occupancy running average.
...
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
9 years ago
Jonathan G Rennison
46103362c3
Fix for loading of SPP games games with aircraft.
9 years ago
Jonathan G Rennison
4fb0f9bacc
SPP loader: Adjust inflation cost scaling on load.
...
SpringPP divides all prices by the difficulty factor, effectively making
things about 8 times cheaper. Adjust the inflation factor to compensate
for this, as otherwise the game is unplayable on load if inflation has
been running for a while. To avoid making things too cheap, clamp the
price inflation factor to no lower than the payment inflation factor.
9 years ago
Jonathan G Rennison
39608841f2
Initial support for loading savegames from SpringPP v2.0.102/103
...
Savegame version 220
Bin all extra settings added in SpringPP.
Bin extra features: trip histories, more conditional orders/jump counter,
prev order time, snow-line chunk, town auto adv. campaign, etc.
Fix vehicle flags.
Fix bridges wrt height changes.
Handle 60-bit RIFF chunk sizes.
Doesn't deal with huge airports, loading games with these may
lead to undefined ehaviour.
PAX signals and traffic lights are ignored.
9 years ago
Jonathan G Rennison
9565e5b9b1
Merge branch 'day_length-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/timetable_cmd.cpp
9 years ago
Jonathan G Rennison
41062cf78e
Save/load changes for variable day length patch.
9 years ago
Jonathan G Rennison
454b3c61b0
Merge branch 'save_ext' into day_length-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison
d70dbda351
Merge branch 'master' into day_length
9 years ago
Jonathan G Rennison
a48652ac6f
Merge branch 'save_ext' into tracerestrict-sx
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
9 years ago
patch-import
d86a56cbef
Import day length patch
...
Minor whitespace fixes.
http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
9 years ago
Jonathan G Rennison
6d6d2f2f0a
Merge branches 'town-rating-label', 'departure-boards-sx', 'infrastructure_sharing-sx' and 'improved_breakdowns-sx' into jgrpp
9 years ago
Jonathan G Rennison
84f9274640
Merge branch 'save_ext' into departure-boards-sx
9 years ago
Jonathan G Rennison
0055e283f1
Merge branch 'save_ext' into improved_breakdowns-sx
9 years ago
Jonathan G Rennison
2f8d330307
Merge branch 'save_ext' into infrastructure_sharing-sx
9 years ago
Jonathan G Rennison
e30d7c2164
Save/load ext: Fix SlXvSetCurrentState being called before AfterLoadGame().
9 years ago
Jonathan G Rennison
4c6dc11c16
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/signal.cpp
src/table/settings.ini
src/vehicle.cpp
9 years ago
Jonathan G Rennison
b3ebb1f729
Infrastructure sharing patch: save/load changes.
9 years ago
Jonathan G Rennison
037cce3b38
Merge branch 'save_ext' into infrastructure_sharing-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison
a4ad4130a6
Merge branch 'master' into infrastructure_sharing
...
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
9 years ago
patch-import
ee791055f9
Import infrastructure sharing patch
...
Strip trailing whitespace
Remove a leftover line form settings.ini
http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago