diff options
author | Erich Eckner <git@eckner.net> | 2021-04-07 11:11:39 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2021-04-07 11:11:39 +0200 |
commit | b612ce2c996e4282f66f722720e34969648ffc5c (patch) | |
tree | 8cd09d3c73da048d0b6f479cb7dcc2e6128ed6e8 /openttd-git/signaltunnel.patch | |
parent | a54d3cc2c3c60f22f95349ba74a79053936774fd (diff) | |
download | archlinuxewe-b612ce2c996e4282f66f722720e34969648ffc5c.tar.xz |
openttd-git: update patches
Diffstat (limited to 'openttd-git/signaltunnel.patch')
-rw-r--r-- | openttd-git/signaltunnel.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/openttd-git/signaltunnel.patch b/openttd-git/signaltunnel.patch index faf5d2aff..4876e09c2 100644 --- a/openttd-git/signaltunnel.patch +++ b/openttd-git/signaltunnel.patch @@ -1,8 +1,8 @@ diff --git a/src/lang/english.txt b/src/lang/english.txt -index 9f43788e54..2f416b882e 100644 +index 0f4b4a99d4..2d146f04f3 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt -@@ -1605,6 +1605,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimum company +@@ -1608,6 +1608,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimum company STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT :Set the minimum age of a company for others to be able to buy and sell shares from them. STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Percentage of leg profit to pay in feeder systems: {STRING2} STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Percentage of income given to the intermediate legs in feeder systems, giving more control over the income @@ -11,7 +11,7 @@ index 9f43788e54..2f416b882e 100644 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :When dragging, place signals every: {STRING2} STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT :Set the distance at which signals will be built on a track up to the next obstacle (signal, junction), if signals are dragged STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE :{COMMA} tile{P 0 "" s} -@@ -2773,8 +2775,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot +@@ -2776,8 +2778,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot # Industries come directly from their industry names STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Railway tunnel @@ -69,7 +69,7 @@ index 9b95578fd5..a70efd8fc7 100644 return false; } diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp -index 133f596437..5a879a45dc 100644 +index a5e985c022..8c0443f282 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -1069,9 +1069,12 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, @@ -261,10 +261,10 @@ index 133f596437..5a879a45dc 100644 /** diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp -index b754508777..ba482fbc89 100644 +index 68587c46a7..03f9270c30 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp -@@ -1549,6 +1549,7 @@ static SettingsContainer &GetSettingsTree() +@@ -1575,6 +1575,7 @@ static SettingsContainer &GetSettingsTree() SettingsPage *construction = interface->Add(new SettingsPage(STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION)); { construction->Add(new SettingEntry("gui.link_terraform_toolbar")); @@ -663,7 +663,7 @@ index 169fb9d71c..5615f076ba 100644 /* Perform look-ahead on tunnel exit. */ if (v->IsFrontEngine()) { diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp -index e71440fc2e..d73b93c951 100644 +index 2f76dbcef9..820f2d0ca7 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -28,6 +28,7 @@ @@ -846,7 +846,7 @@ index e71440fc2e..d73b93c951 100644 static TrackStatus GetTileTrackStatus_TunnelBridge(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side) { TransportType transport_type = GetTunnelBridgeTransportType(tile); -@@ -2047,8 +2173,8 @@ extern const TileTypeProcs _tile_type_tunnelbridge_procs = { +@@ -2048,8 +2174,8 @@ extern const TileTypeProcs _tile_type_tunnelbridge_procs = { nullptr, // add_accepted_cargo_proc GetTileDesc_TunnelBridge, // get_tile_desc_proc GetTileTrackStatus_TunnelBridge, // get_tile_track_status_proc |