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.
2015-08-09 18:31:00 +01:00
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.
2015-08-09 18:31:00 +01:00
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
2015-08-09 13:51:36 +01:00
Jonathan G Rennison
41062cf78e
Save/load changes for variable day length patch.
2015-08-09 13:50:06 +01:00
Jonathan G Rennison
454b3c61b0
Merge branch 'save_ext' into day_length-sx
...
Conflicts:
src/saveload/saveload.cpp
2015-08-09 12:10:05 +01:00
Jonathan G Rennison
d70dbda351
Merge branch 'master' into day_length
2015-08-09 12:04:23 +01:00
Jonathan G Rennison
a48652ac6f
Merge branch 'save_ext' into tracerestrict-sx
...
Conflicts:
src/pathfinder/yapf/yapf_costrail.hpp
2015-08-09 11:57:09 +01:00
patch-import
d86a56cbef
Import day length patch
...
Minor whitespace fixes.
http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
2015-08-09 11:23:15 +01:00
Jonathan G Rennison
6d6d2f2f0a
Merge branches 'town-rating-label', 'departure-boards-sx', 'infrastructure_sharing-sx' and 'improved_breakdowns-sx' into jgrpp
2015-08-07 20:38:58 +01:00
Jonathan G Rennison
84f9274640
Merge branch 'save_ext' into departure-boards-sx
2015-08-07 20:17:08 +01:00
Jonathan G Rennison
0055e283f1
Merge branch 'save_ext' into improved_breakdowns-sx
2015-08-07 20:16:35 +01:00
Jonathan G Rennison
2f8d330307
Merge branch 'save_ext' into infrastructure_sharing-sx
2015-08-07 20:16:19 +01:00
Jonathan G Rennison
e30d7c2164
Save/load ext: Fix SlXvSetCurrentState being called before AfterLoadGame().
2015-08-07 20:12:25 +01:00
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
2015-08-06 23:11:49 +01:00
Jonathan G Rennison
b3ebb1f729
Infrastructure sharing patch: save/load changes.
2015-08-06 23:02:47 +01:00
Jonathan G Rennison
037cce3b38
Merge branch 'save_ext' into infrastructure_sharing-sx
...
Conflicts:
src/saveload/saveload.cpp
2015-08-06 23:01:01 +01:00
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
2015-08-06 22:55:09 +01:00
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
2015-08-06 22:24:28 +01:00
Jonathan G Rennison
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
2015-08-05 21:54:11 +01:00
Jonathan G Rennison
44d3c84a11
Save/load changes for enhanced viewport patch: plans.
2015-08-05 21:33:47 +01:00
Jonathan G Rennison
174779e371
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
...
Conflicts:
src/saveload/saveload.cpp
2015-08-05 21:31:57 +01:00
Jonathan G Rennison
03b6c41c67
Add shorthand flag in SlxiSubChunkFlags for XSCF_IGNORABLE_UNKNOWN | XSCF_IGNORABLE_VERSION.
2015-08-05 21:31:17 +01:00
Jonathan G Rennison
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
2015-08-05 21:25:13 +01:00
patch-import
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
2015-08-05 21:24:30 +01:00
Jonathan G Rennison
20e2f363f1
Merge branch 'vehicle_repair_costs-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_type.h
2015-08-04 23:59:12 +01:00
Jonathan G Rennison
6bb8d5087d
Vehicle repair costs patch: implement save/load changes.
2015-08-04 23:56:37 +01:00
Jonathan G Rennison
0a7441e56c
Merge branch 'save_ext' into vehicle_repair_costs-sx
...
Conflicts:
src/saveload/saveload.cpp
src/settings_gui.cpp
2015-08-04 23:56:05 +01:00
Jonathan G Rennison
938babfe7b
Vehicle repair costs patch: whitespace fixes.
2015-08-04 23:39:02 +01:00
patch-import
7537ae2a7e
Import vehicle repair costs patch
...
Strip trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268
2015-08-04 23:38:35 +01:00
Jonathan G Rennison
ba4e5dd62f
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
src/vehicle.cpp
2015-08-04 22:08:59 +01:00
Jonathan G Rennison
2e45dac18a
Auto timetables patch: save/load changes, document rationale for
...
moving addition to VehicleFlags
2015-08-04 22:07:02 +01:00
Jonathan G Rennison
33854a138f
Merge branch 'save_ext' into auto_timetables-sx
2015-08-04 21:30:30 +01:00
Jonathan G Rennison
0ebf8b6b0b
Fixes to auto timetable patch: move new VehicleFlags to end,
...
whitespace & style, fix lang strings.
2015-08-04 21:29:19 +01:00
patch-import
80deb3c01d
Import auto timetable separation patch
...
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
2015-08-04 21:27:23 +01:00
Jonathan G Rennison
163423e7b5
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
2015-08-04 19:16:37 +01:00
Jonathan G Rennison
a38c98d10a
Bump SLXI tracerestrict version due to PBS entry and PF penalty new features.
2015-08-04 19:15:54 +01:00
Jonathan G Rennison
e4ccea350b
Merge branch 'wait_in_depot-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
2015-08-03 01:12:16 +01:00
Jonathan G Rennison
1fbd4a9d1d
Timetable wait in depot: Add info to SLXI chunk.
2015-08-03 01:10:22 +01:00
Jonathan G Rennison
bc8b2d9826
Merge branch 'save_ext' into tracerestrict-sx
2015-08-03 00:14:51 +01:00
Jonathan G Rennison
77ec2aac58
Merge branch 'save_ext' into progsig-sx
2015-08-03 00:14:12 +01:00
Jonathan G Rennison
8fe9a7430c
Merge branch 'save_ext' into departure-boards-sx
2015-08-03 00:12:38 +01:00
Jonathan G Rennison
6ac6759b00
Merge branch 'save_ext' into signal_tunnels_bridges-sx
2015-08-03 00:11:54 +01:00
Jonathan G Rennison
a8c2c394a5
Merge branch 'improved_breakdowns-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_type.h
2015-08-02 23:43:19 +01:00
Jonathan G Rennison
a8a726464c
Merge branch 'save_ext' into improved_breakdowns-sx
2015-08-02 23:37:54 +01:00
Jonathan G Rennison
047395c663
Remove unnecessary and buggy field-packing in struct SlXvFeatureTest.
2015-08-02 23:37:34 +01:00
Jonathan G Rennison
e91d0e49dc
Improved breakdowns: Update save/load code
2015-08-02 23:16:33 +01:00
Jonathan G Rennison
d023d0863f
Merge branch 'save_ext' into improved_breakdowns-sx
...
Conflicts:
src/saveload/saveload.cpp
2015-08-02 23:01:56 +01:00
Jonathan G Rennison
80d52eb20e
Improved breakdowns patch: fix various issues
...
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
2015-08-02 23:00:39 +01:00
patch-import
9f5164b403
Import Improved Breakdowns patch
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
2015-08-02 22:58:52 +01:00
Jonathan G Rennison
27c70542da
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_type.h
src/signal.cpp
2015-08-02 18:45:32 +01:00
