diff options
Diffstat (limited to 'openttd-git/signaltunnel.patch')
-rw-r--r-- | openttd-git/signaltunnel.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/openttd-git/signaltunnel.patch b/openttd-git/signaltunnel.patch index f9496fd6..c3496648 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 d829b44361..b63232c302 100644 +index 1751e360f0..0b7f53917b 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt -@@ -1565,6 +1565,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimum company +@@ -1575,6 +1575,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 d829b44361..b63232c302 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} -@@ -2705,8 +2707,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot +@@ -2724,8 +2726,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 d829b44361..b63232c302 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 9ceb1b6bc4..d1ac42243d 100644 +index 3be3a6762f..e9d3ea6124 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt -@@ -1717,6 +1717,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Мин. воз +@@ -1727,6 +1727,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Мин. воз STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT :Минимальный возраст, которого должна достичь компания для начала выпуска акций, которыми смогут торговать другие игроки. STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Процент дохода, начисляемый при частичной перевозке: {STRING} STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Процент прибыли, начисляемый транспорту за частичную перевозку груза. @@ -35,7 +35,7 @@ index 9ceb1b6bc4..d1ac42243d 100644 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :При перетаскивании ставить сигналы каждые: {STRING} STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT :Настройка периодичности расстановки сигналов методом перетаскивания. Сигналы будут устанавливаться до первого встреченного препятствия (пересечения или другого сигнала). STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE :{COMMA} клет{P ку ки ок} -@@ -2884,8 +2886,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Верфь +@@ -2898,8 +2900,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Верфь # Industries come directly from their industry names STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Железнодорожный туннель @@ -69,7 +69,7 @@ index 2cfe4d9e4a..dbf225d785 100644 return false; } diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp -index 162fe97799..186c7b8228 100644 +index a714415326..fa76640f8d 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 162fe97799..186c7b8228 100644 /** diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp -index c7dd0cb140..38c56a2c0d 100644 +index 77be428c9d..ba01d077a0 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1551,6 +1551,7 @@ static SettingsContainer &GetSettingsTree() @@ -273,10 +273,10 @@ index c7dd0cb140..38c56a2c0d 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 2dbca59d82..a5d8a00364 100644 +index 5729a50bea..2332fcd0ed 100644 --- a/src/settings_type.h +++ b/src/settings_type.h -@@ -318,6 +318,7 @@ struct ConstructionSettings { +@@ -317,6 +317,7 @@ struct ConstructionSettings { bool freeform_edges; ///< allow terraforming the tiles at the map edges uint8 extra_tree_placement; ///< (dis)allow building extra trees in-game uint8 command_pause_level; ///< level/amount of commands that can't be executed while paused @@ -285,7 +285,7 @@ index 2dbca59d82..a5d8a00364 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 9b17e51dcb..fd299eb690 100644 +index d6795e3b5c..6a7eca6b64 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -195,6 +195,14 @@ static Vehicle *TrainOnTileEnum(Vehicle *v, void *) @@ -366,7 +366,7 @@ index 9b17e51dcb..fd299eb690 100644 case MP_RAILWAY: diff --git a/src/table/settings.ini b/src/table/settings.ini -index cca6a99bf8..5982268c3a 100644 +index b75dd0ff28..2a594b6fa6 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -541,6 +541,20 @@ str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH @@ -663,7 +663,7 @@ index 5d02764b55..1eddbf665e 100644 /* Perform look-ahead on tunnel exit. */ if (v->IsFrontEngine()) { diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp -index 47bb34f194..8949f73c15 100644 +index 0423cde1f9..352d07236e 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -28,6 +28,7 @@ |