Commit Graph

22389 Commits

Author SHA1 Message Date
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
b5c453b21e Add generic mechanism to cross-ref settings at load time.
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.
Use this to load SpringPP settings which have a corresponding setting.
2015-08-17 20:11:30 +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
9716026809 Merge branch 'jgrpp' into save_ext_spp 2015-08-15 15:24:21 +01:00
Jonathan G Rennison
bcdae2ff21 Merge branch 'tracerestrict-sx' into jgrpp 2015-08-15 00:32:40 +01:00
Jonathan G Rennison
6088c7fc24 Merge branch 'tracerestrict' into tracerestrict-sx 2015-08-15 00:32:15 +01:00
Jonathan G Rennison
29c4f244f3 Merge branch 'master' into tracerestrict
Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp
2015-08-15 00:28:14 +01:00
translators
8cfc1e9d23 (svn r27386) -Update from WebTranslator v3.0:
dutch - 3 changes by TheTycoonist
2015-08-14 17:45:16 +00:00
rubidium
3b8aabdd9e (svn r27385) -Fix: compilation failure due #define-ing enum name of a system library before including the system library 2015-08-13 18:13:24 +00:00
translators
70322bce59 (svn r27384) -Update from WebTranslator v3.0:
catalan - 35 changes by juanjo
2015-08-13 17:45:15 +00:00
rubidium
8f711aca53 (svn r27383) -Fix: win32 sound driver would not catch the exception due to constness difference 2015-08-12 20:50:10 +00:00
Jonathan G Rennison
671151474b Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/settings_gui.cpp
2015-08-11 21:43:12 +01:00
Jonathan G Rennison
87c8bb74bd Merge branch 'service_autorenew' into jgrpp 2015-08-11 21:42:30 +01:00
Jonathan G Rennison
19764bb4fb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-08-11 21:41:58 +01:00
Jonathan G Rennison
88c150abf7 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2015-08-11 21:41:48 +01:00
Jonathan G Rennison
388dab7390 Merge branch 'master' into enhanced_viewport_overlay
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
2015-08-11 21:41:41 +01:00
Jonathan G Rennison
dd2805da8c Servicing: send vehicles which need auto-renewing due to age for servicing,
even if breakdowns are off and no servicing if no breakdowns is on.
2015-08-11 21:34:29 +01:00
Jonathan G Rennison
25bc8eb1e2 Save/load changes for timetable_separation_rate setting. 2015-08-11 21:24:56 +01:00
Jonathan G Rennison
adb3156951 Merge branch 'auto_timetables' into auto_timetables-sx 2015-08-11 21:24:05 +01:00
Jonathan G Rennison
40ad3dea02 Auto separation: Add setting to scale vehicle lateness adjustments.
No longer set vehicle lateness to 0 if separation fails, instead
leave it as it was.

The setting defaults to 100% (full abruptness, old behaviour).
Reduce the setting if auto separation is too disruptive, e.g. causes
excessive waiting in stations.

Note that this is not savegame compatible.
2015-08-11 21:20:01 +01:00
Jonathan G Rennison
cca6495d1e Auto timetabling: bias timetable adjustment to favour negative adjustments.
This is to prevent positive feedback where timetable times are increased
due to congestion, which creates more congestion due to trains waiting
for extended periods at stations and/or due to timetable auto separation
going overboard due to overly long timetables.

* Double rate of negative adjustments.
* Half rate of positive adjustments.
* Only do step changes for large negative adjustments.
* Reduce jam detection threshold.
2015-08-11 21:14:58 +01:00
michi_cc
f4cd0198f4 (svn r27382) -Add: [Win32] Project files for Visual Studio 2015. 2015-08-10 20:36:57 +00:00
michi_cc
44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
michi_cc
0cd198c798 (svn r27380) -Fix: [Win32] Compilation with MSVC2015. 2015-08-10 20:21:29 +00:00
frosch
63aa9f4ea8 (svn r27379) -Codechange: Do not throw in the destructors of ScriptTest/ExecMode. 2015-08-10 20:04:31 +00:00
alberth
438d7a26cc (svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum. 2015-08-10 10:04:14 +00: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
Jonathan G Rennison
15f3abf47d Fix typo in save/load ext feature enum name for improved breakdown. 2015-08-09 23:58:24 +01:00
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
2015-08-09 23:45:21 +01:00
Jonathan G Rennison
fdce64ddae Save/load changes for order occupancy 2015-08-09 23:43:55 +01:00
Jonathan G Rennison
52c07d1f51 Merge branch 'save_ext' into order_occupancy-sx
Conflicts:
	src/saveload/saveload.cpp
2015-08-09 23:40:25 +01:00
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.
2015-08-09 23:39:55 +01:00
Jonathan G Rennison
46103362c3 Fix for loading of SPP games games with aircraft. 2015-08-09 18:31:00 +01:00
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
bd10b0fb0b Merge branch 'departure-boards-sx' into jgrpp 2015-08-09 17:11:17 +01:00
Jonathan G Rennison
365f1c237f Merge branch 'auto_timetables-sx' into jgrpp 2015-08-09 17:11:11 +01:00
Jonathan G Rennison
d5f9709c56 Merge branch 'departure-boards' into departure-boards-sx 2015-08-09 17:09:06 +01:00
Jonathan G Rennison
1795fb5953 Fix departure boards with orders with timetabled 0 travel times,
e.g. those with depot service orders.
2015-08-09 17:08:57 +01:00
Jonathan G Rennison
346cebab43 Merge branch 'master' into departure-boards 2015-08-09 17:08:45 +01:00
Jonathan G Rennison
f820bbe0c5 Merge branch 'auto_timetables' into auto_timetables-sx 2015-08-09 17:08:26 +01:00
Jonathan G Rennison
d24f7763cc Fix auto timetable separation to handle non-station orders sensibly. 2015-08-09 17:07:50 +01:00
Jonathan G Rennison
34e41a2e26 Timetable GUI: Allow clearing of timetable time fields which are at 0.
Allow explicitly setting timetable time fields to 0 without clearing them.
2015-08-09 17:07:46 +01:00
Jonathan G Rennison
15c2327fd4 Merge branch 'master' into auto_timetables 2015-08-09 17:07:41 +01:00
rubidium
eb4b6a08d0 (svn r27377) -Codechange: use the pkg-config files of ICU as well. Since they are split into separate libraries it becomes possible to split RTL support for natural sorting, although the effect will be minimal 2015-08-09 13:54:17 +00: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
rubidium
cc5b8ea6cb (svn r27376) -Codechange: let libtimidity detection and configuration make use of pkg-config 2015-08-09 12:43:52 +00:00