From c6ca222b03679ededa04c7d22c9ab373b643b221 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 28 Jan 2019 20:52:48 +0100 Subject: openttd-git: 28426.ed325ada88 -> 28461.310fa1af88 --- manualPorts/openttd-git/signaltunnel.patch | 44 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'manualPorts/openttd-git/signaltunnel.patch') diff --git a/manualPorts/openttd-git/signaltunnel.patch b/manualPorts/openttd-git/signaltunnel.patch index d018c56..7c5de96 100644 --- a/manualPorts/openttd-git/signaltunnel.patch +++ b/manualPorts/openttd-git/signaltunnel.patch @@ -1,8 +1,8 @@ diff --git a/src/lang/english.txt b/src/lang/english.txt -index c0231557ce0c..68ba87f083af 100644 +index 83406296cc..91dea0cea0 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt -@@ -1535,6 +1535,8 @@ STR_CONFIG_SETTING_ALLOW_SHARES :Allow buying sh +@@ -1536,6 +1536,8 @@ STR_CONFIG_SETTING_ALLOW_SHARES :Allow buying sh STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :When enabled, allow buying and selling of company shares. Shares will only be available for companies reaching a certain age 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 c0231557ce0c..68ba87f083af 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} -@@ -2673,8 +2675,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot +@@ -2674,8 +2676,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot # Industries come directly from their industry names STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Railway tunnel @@ -23,10 +23,10 @@ index c0231557ce0c..68ba87f083af 100644 STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEEL :Steel girder rail bridge STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL :Steel cantilever rail bridge diff --git a/src/lang/russian.txt b/src/lang/russian.txt -index 7574bd8bfb71..feb89df2754d 100644 +index 72132ac069..e6fa0817f7 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt -@@ -1684,6 +1684,8 @@ STR_CONFIG_SETTING_ALLOW_SHARES :Разреши +@@ -1688,6 +1688,8 @@ STR_CONFIG_SETTING_ALLOW_SHARES :Разреши STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :Разрешает торговлю акциями транспортных компаний. Акции выпускаются компаниями через некоторое время после основания. STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Процент дохода, начисляемый при частичной перевозке: {STRING} STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Процент прибыли, начисляемый транспорту за частичную перевозку груза. @@ -35,7 +35,7 @@ index 7574bd8bfb71..feb89df2754d 100644 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :При перетаскивании ставить сигналы каждые: {STRING} STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT :Настройка периодичности расстановки сигналов методом перетаскивания. Сигналы будут устанавливаться до первого встреченного препятствия (пересечения или другого сигнала). STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE :{COMMA} клет{P ку ки ок} -@@ -2850,8 +2852,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Верфь +@@ -2854,8 +2856,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Верфь # Industries come directly from their industry names STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Железнодорожный туннель @@ -47,7 +47,7 @@ index 7574bd8bfb71..feb89df2754d 100644 STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEEL :Стальной балочный ж/д мост STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL :Стальной консольный ж/д мост diff --git a/src/pathfinder/follow_track.hpp b/src/pathfinder/follow_track.hpp -index 9b4377248e28..6eedaab0c2e4 100644 +index 9b4377248e..6eedaab0c2 100644 --- a/src/pathfinder/follow_track.hpp +++ b/src/pathfinder/follow_track.hpp @@ -360,7 +360,7 @@ protected: @@ -69,7 +69,7 @@ index 9b4377248e28..6eedaab0c2e4 100644 return false; } diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp -index a0fd968cc66e..7275a55a4fca 100644 +index a0fd968cc6..7275a55a4f 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -1045,9 +1045,12 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, @@ -261,7 +261,7 @@ index a0fd968cc66e..7275a55a4fca 100644 /** diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp -index 134b1f58ffc7..db47f6f8b4fd 100644 +index 134b1f58ff..db47f6f8b4 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1535,6 +1535,7 @@ static SettingsContainer &GetSettingsTree() @@ -273,7 +273,7 @@ index 134b1f58ffc7..db47f6f8b4fd 100644 construction->Add(new SettingEntry("gui.persistent_buildingtools")); construction->Add(new SettingEntry("gui.quick_goto")); diff --git a/src/settings_type.h b/src/settings_type.h -index 8f03b1dc15b0..7129525b6118 100644 +index 8f03b1dc15..7129525b61 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -322,6 +322,7 @@ struct ConstructionSettings { @@ -285,7 +285,7 @@ index 8f03b1dc15b0..7129525b6118 100644 uint32 terraform_per_64k_frames; ///< how many tile heights may, over a long period, be terraformed per 65536 frames? uint16 terraform_frame_burst; ///< how many tile heights may, over a short period, be terraformed? diff --git a/src/signal.cpp b/src/signal.cpp -index b37e15074aca..0de45a57c7dc 100644 +index b37e15074a..0de45a57c7 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -197,6 +197,14 @@ static Vehicle *TrainOnTileEnum(Vehicle *v, void *) @@ -366,10 +366,10 @@ index b37e15074aca..0de45a57c7dc 100644 case MP_RAILWAY: diff --git a/src/table/settings.ini b/src/table/settings.ini -index bb6159693ac0..7470652160ae 100644 +index 7afdd80801..ea81554aec 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini -@@ -541,6 +541,20 @@ str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH +@@ -542,6 +542,20 @@ str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH strhelp = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT strval = STR_CONFIG_SETTING_TILE_LENGTH @@ -391,7 +391,7 @@ index bb6159693ac0..7470652160ae 100644 [SDT_NULL] length = 1 diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp -index c8387d0a9599..4b534cdb6d03 100644 +index 01aa946edb..7386c07f29 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1852,6 +1852,17 @@ void ReverseTrainDirection(Train *v) @@ -412,7 +412,7 @@ index c8387d0a9599..4b534cdb6d03 100644 /* VehicleExitDir does not always produce the desired dir for depots and * tunnels/bridges that is needed for UpdateSignalsOnSegment. */ DiagDirection dir = VehicleExitDir(v->direction, v->track); -@@ -2188,6 +2199,42 @@ static bool CheckTrainStayInDepot(Train *v) +@@ -2186,6 +2197,42 @@ static bool CheckTrainStayInDepot(Train *v) return false; } @@ -455,7 +455,7 @@ index c8387d0a9599..4b534cdb6d03 100644 /** * Clear the reservation of \a tile that was just left by a wagon on \a track_dir. * @param v %Train owning the reservation. -@@ -2203,7 +2250,8 @@ static void ClearPathReservation(const Train *v, TileIndex tile, Trackdir track_ +@@ -2201,7 +2248,8 @@ static void ClearPathReservation(const Train *v, TileIndex tile, Trackdir track_ if (GetTunnelBridgeDirection(tile) == ReverseDiagDir(dir)) { TileIndex end = GetOtherTunnelBridgeEnd(tile); @@ -465,7 +465,7 @@ index c8387d0a9599..4b534cdb6d03 100644 /* Free the reservation only if no other train is on the tiles. */ SetTunnelBridgeReservation(tile, false); SetTunnelBridgeReservation(end, false); -@@ -2217,6 +2265,7 @@ static void ClearPathReservation(const Train *v, TileIndex tile, Trackdir track_ +@@ -2215,6 +2263,7 @@ static void ClearPathReservation(const Train *v, TileIndex tile, Trackdir track_ } } } @@ -473,7 +473,7 @@ index c8387d0a9599..4b534cdb6d03 100644 } } else if (IsRailStationTile(tile)) { TileIndex new_tile = TileAddByDiagDir(tile, dir); -@@ -3083,6 +3132,99 @@ static Vehicle *CheckTrainAtSignal(Vehicle *v, void *data) +@@ -3081,6 +3130,99 @@ static Vehicle *CheckTrainAtSignal(Vehicle *v, void *data) return t; } @@ -573,7 +573,7 @@ index c8387d0a9599..4b534cdb6d03 100644 /** * Move a vehicle chain one movement stop forwards. * @param v First vehicle to move. -@@ -3268,6 +3410,23 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) +@@ -3266,6 +3408,23 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) goto invalid_rail; } @@ -597,7 +597,7 @@ index c8387d0a9599..4b534cdb6d03 100644 if (!HasBit(r, VETS_ENTERED_WORMHOLE)) { Track track = FindFirstTrack(chosen_track); Trackdir tdir = TrackDirectionToTrackdir(track, chosen_dir); -@@ -3320,6 +3479,64 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) +@@ -3318,6 +3477,64 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse) } } } else { @@ -663,7 +663,7 @@ index c8387d0a9599..4b534cdb6d03 100644 /* Perform look-ahead on tunnel exit. */ if (v->IsFrontEngine()) { diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp -index 06dc24e84fc2..4b293fa02d5e 100644 +index 06dc24e84f..4b293fa02d 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -30,6 +30,7 @@ @@ -857,7 +857,7 @@ index 06dc24e84fc2..4b293fa02d5e 100644 TileLoop_TunnelBridge, // tile_loop_proc ChangeTileOwner_TunnelBridge, // change_tile_owner_proc diff --git a/src/tunnelbridge_map.h b/src/tunnelbridge_map.h -index 0f7f17b3ac6e..57f338b8be3c 100644 +index 0f7f17b3ac..57f338b8be 100644 --- a/src/tunnelbridge_map.h +++ b/src/tunnelbridge_map.h @@ -121,4 +121,98 @@ static inline TrackBits GetTunnelBridgeReservationTrackBits(TileIndex t) -- cgit v1.2.3-54-g00ecf