diff options
Diffstat (limited to 'openttd-git/signaltunnel.patch')
| -rw-r--r-- | openttd-git/signaltunnel.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/openttd-git/signaltunnel.patch b/openttd-git/signaltunnel.patch index 64f701e1f..4444ddafe 100644 --- a/openttd-git/signaltunnel.patch +++ b/openttd-git/signaltunnel.patch @@ -1,5 +1,5 @@ diff --git a/src/lang/english.txt b/src/lang/english.txt -index e478dc6e1c2..336130877b3 100644 +index e478dc6e1c..336130877b 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1561,6 +1561,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimum company @@ -23,7 +23,7 @@ index e478dc6e1c2..336130877b3 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 4f98e7adee7..d4600504b0c 100644 +index 4f98e7adee..d4600504b0 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1712,6 +1712,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Мин. воз @@ -47,7 +47,7 @@ index 4f98e7adee7..d4600504b0c 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 2cfe4d9e4a5..dbf225d785f 100644 +index 2cfe4d9e4a..dbf225d785 100644 --- a/src/pathfinder/follow_track.hpp +++ b/src/pathfinder/follow_track.hpp @@ -370,7 +370,7 @@ protected: @@ -69,7 +69,7 @@ index 2cfe4d9e4a5..dbf225d785f 100644 return false; } diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp -index 162fe97799a..186c7b82282 100644 +index 162fe97799..186c7b8228 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -1059,9 +1059,12 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, @@ -261,7 +261,7 @@ index 162fe97799a..186c7b82282 100644 /** diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp -index 968be54f672..462d1a0e700 100644 +index 968be54f67..462d1a0e70 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1552,6 +1552,7 @@ static SettingsContainer &GetSettingsTree() @@ -273,7 +273,7 @@ index 968be54f672..462d1a0e700 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 fdb2b0f862d..0cbc26d6437 100644 +index fdb2b0f862..0cbc26d643 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -317,6 +317,7 @@ struct ConstructionSettings { @@ -285,7 +285,7 @@ index fdb2b0f862d..0cbc26d6437 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 068ca6193bd..b9627483ac0 100644 +index 068ca6193b..b9627483ac 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -195,6 +195,14 @@ static Vehicle *TrainOnTileEnum(Vehicle *v, void *) @@ -366,7 +366,7 @@ index 068ca6193bd..b9627483ac0 100644 case MP_RAILWAY: diff --git a/src/table/settings.ini b/src/table/settings.ini -index 43bd3aec325..ab9a0336a5b 100644 +index 43bd3aec32..ab9a0336a5 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -541,6 +541,20 @@ str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH @@ -391,7 +391,7 @@ index 43bd3aec325..ab9a0336a5b 100644 [SDT_NULL] length = 1 diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp -index 5d02764b55f..1eddbf665ef 100644 +index 5d02764b55..1eddbf665e 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1845,6 +1845,17 @@ void ReverseTrainDirection(Train *v) @@ -663,7 +663,7 @@ index 5d02764b55f..1eddbf665ef 100644 /* Perform look-ahead on tunnel exit. */ if (v->IsFrontEngine()) { diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp -index c5e2f8d9bb4..b693caee518 100644 +index c5e2f8d9bb..b693caee51 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -28,6 +28,7 @@ @@ -858,7 +858,7 @@ index c5e2f8d9bb4..b693caee518 100644 ChangeTileOwner_TunnelBridge, // change_tile_owner_proc nullptr, // add_produced_cargo_proc diff --git a/src/tunnelbridge_map.h b/src/tunnelbridge_map.h -index 62d3c14b2dd..fa029dcf4de 100644 +index 62d3c14b2d..fa029dcf4d 100644 --- a/src/tunnelbridge_map.h +++ b/src/tunnelbridge_map.h @@ -119,4 +119,98 @@ static inline TrackBits GetTunnelBridgeReservationTrackBits(TileIndex t) |