diff options
| -rw-r--r-- | openttd-git/PKGBUILD | 8 | ||||
| -rw-r--r-- | openttd-git/signaltunnel.patch | 34 | ||||
| -rw-r--r-- | openttd-git/sloped-stations.patch | 24 | ||||
| -rw-r--r-- | openttd-git/underground.patch | 256 |
4 files changed, 161 insertions, 161 deletions
diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD index 8bc502987..d06fbf191 100644 --- a/openttd-git/PKGBUILD +++ b/openttd-git/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Erich Eckner <arch at eckner dot net> pkgname=openttd-git -pkgver=28486.9e9d48571 +pkgver=28508.bf5898018 _commit=${pkgver#*.} pkgrel=1 pkgdesc="A FOSS clone of Transport Tycoon Deluxe." @@ -39,9 +39,9 @@ source=( "underground.patch" ) sha512sums=('SKIP' - '8809a919aec99f5235067dcea1beda18ae65d12f3a37f304e3e341a94312819cb13a46c70c42d261e5487eeeb784d4ec098df6887dde5bb6d447a8dfbd5f08f4' - '61b707d6ae0ad9a50a68fe3e1de9d28c20ee062552c045ca4e786968dfb6681abcf215ea59d67d415f81e7fdbceaa208f7184cb468a6c170a30e38b292c05723' - '7369d488fc66c4a2249352f2481c31da91b19b3aed2a42b7bcf456c59ccd18dc011d42df3c2ad68be57e427237895fefa6d7b6c6661fa971875fa8f3d299a415') + '56c7c0d9787c4d205559ac81c385e429bf1e0df9db6882631a0b66e382689b59fd8064d100da024c75fe3b3f09805bcde9ae196d6aa2e6dafb209392a587f56e' + 'f0b861210b57b6c6701ff791cfa67cc0720adef5c6db7d7affa9702c65fd544b34b09692920e186cd41b951562615db9f20f24144b08d40183ffaa7076fa8148' + 'b0ba481a9263af12d918a51371430401c854f3f36ca9d1e05e1335deb3b3da0a135b1a3bb4e10cdefa2aeae62b643271698567172bec3e964a01e49a16395f9b') pkgver() { printf '%s.%s\n' \ diff --git a/openttd-git/signaltunnel.patch b/openttd-git/signaltunnel.patch index 7c5de96a0..f8c8fac4c 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 83406296cc..91dea0cea0 100644 +index 856ca2f81a1..6070faada8e 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt -@@ -1536,6 +1536,8 @@ STR_CONFIG_SETTING_ALLOW_SHARES :Allow buying sh +@@ -1537,6 +1537,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 83406296cc..91dea0cea0 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} -@@ -2674,8 +2676,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot +@@ -2675,8 +2677,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 83406296cc..91dea0cea0 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 72132ac069..e6fa0817f7 100644 +index ed24128997e..be6c9783a0f 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt -@@ -1688,6 +1688,8 @@ STR_CONFIG_SETTING_ALLOW_SHARES :Разреши +@@ -1689,6 +1689,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 72132ac069..e6fa0817f7 100644 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY :При перетаскивании ставить сигналы каждые: {STRING} STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT :Настройка периодичности расстановки сигналов методом перетаскивания. Сигналы будут устанавливаться до первого встреченного препятствия (пересечения или другого сигнала). STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_VALUE :{COMMA} клет{P ку ки ок} -@@ -2854,8 +2856,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Верфь +@@ -2855,8 +2857,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Верфь # Industries come directly from their industry names STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Железнодорожный туннель @@ -47,7 +47,7 @@ index 72132ac069..e6fa0817f7 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 9b4377248e..6eedaab0c2 100644 +index 9b4377248e2..6eedaab0c2e 100644 --- a/src/pathfinder/follow_track.hpp +++ b/src/pathfinder/follow_track.hpp @@ -360,7 +360,7 @@ protected: @@ -69,7 +69,7 @@ index 9b4377248e..6eedaab0c2 100644 return false; } diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp -index a0fd968cc6..7275a55a4f 100644 +index a0fd968cc66..7275a55a4fc 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -1045,9 +1045,12 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, @@ -261,10 +261,10 @@ index a0fd968cc6..7275a55a4f 100644 /** diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp -index 134b1f58ff..db47f6f8b4 100644 +index 2faf2b150b1..20c69dc5b4b 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp -@@ -1535,6 +1535,7 @@ static SettingsContainer &GetSettingsTree() +@@ -1536,6 +1536,7 @@ static SettingsContainer &GetSettingsTree() SettingsPage *construction = interface->Add(new SettingsPage(STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION)); { construction->Add(new SettingEntry("gui.link_terraform_toolbar")); @@ -273,7 +273,7 @@ index 134b1f58ff..db47f6f8b4 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 8f03b1dc15..7129525b61 100644 +index 8f03b1dc15b..7129525b611 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -322,6 +322,7 @@ struct ConstructionSettings { @@ -285,7 +285,7 @@ index 8f03b1dc15..7129525b61 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 b37e15074a..0de45a57c7 100644 +index b37e15074ac..0de45a57c7d 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -197,6 +197,14 @@ static Vehicle *TrainOnTileEnum(Vehicle *v, void *) @@ -366,7 +366,7 @@ index b37e15074a..0de45a57c7 100644 case MP_RAILWAY: diff --git a/src/table/settings.ini b/src/table/settings.ini -index 7afdd80801..ea81554aec 100644 +index 2b36e32b7c3..6ddd7f240db 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -542,6 +542,20 @@ str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH @@ -384,14 +384,14 @@ index 7afdd80801..ea81554aec 100644 +str = STR_CONFIG_SETTING_SIMULATE_SIGNALS +strval = STR_CONFIG_SETTING_SIMULATE_SIGNALS_VALUE +proc = RedrawScreen -+from = 0 ++from = SL_MIN_VERSION +cat = SC_BASIC + # construction.longbridges [SDT_NULL] length = 1 diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp -index 01aa946edb..7386c07f29 100644 +index c4deedde806..ac0b9cf2131 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1852,6 +1852,17 @@ void ReverseTrainDirection(Train *v) @@ -663,7 +663,7 @@ index 01aa946edb..7386c07f29 100644 /* Perform look-ahead on tunnel exit. */ if (v->IsFrontEngine()) { diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp -index 06dc24e84f..4b293fa02d 100644 +index 06dc24e84fc..4b293fa02d5 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -30,6 +30,7 @@ @@ -857,7 +857,7 @@ index 06dc24e84f..4b293fa02d 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 0f7f17b3ac..57f338b8be 100644 +index 0f7f17b3ac6..57f338b8be3 100644 --- a/src/tunnelbridge_map.h +++ b/src/tunnelbridge_map.h @@ -121,4 +121,98 @@ static inline TrackBits GetTunnelBridgeReservationTrackBits(TileIndex t) diff --git a/openttd-git/sloped-stations.patch b/openttd-git/sloped-stations.patch index ebac52891..0380a4782 100644 --- a/openttd-git/sloped-stations.patch +++ b/openttd-git/sloped-stations.patch @@ -1,5 +1,5 @@ diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp -index a0fd968cc6..980e2fb42b 100644 +index a0fd968cc66..980e2fb42bc 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -186,14 +186,6 @@ RailType AllocateRailType(RailTypeLabel label) @@ -18,7 +18,7 @@ index a0fd968cc6..980e2fb42b 100644 * --------- * |\ /| diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp -index 175e776e5e..3a29647493 100644 +index d9825c9bfae..15b804af8d6 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -35,6 +35,7 @@ @@ -38,7 +38,7 @@ index 175e776e5e..3a29647493 100644 /** * Is it allowed to remove the given road bits from the given tile? * @param tile the tile to remove the road from -@@ -1143,7 +1142,7 @@ struct DrawRoadTileStruct { +@@ -1145,7 +1144,7 @@ struct DrawRoadTileStruct { * @param bits The RoadBits part * @return The resulting Foundation */ @@ -47,7 +47,7 @@ index 175e776e5e..3a29647493 100644 { /* Flat land and land without a road doesn't require a foundation */ if (tileh == SLOPE_FLAT || bits == ROAD_NONE) return FOUNDATION_NONE; -@@ -1165,13 +1164,6 @@ static Foundation GetRoadFoundation(Slope tileh, RoadBits bits) +@@ -1167,13 +1166,6 @@ static Foundation GetRoadFoundation(Slope tileh, RoadBits bits) return (bits == ROAD_X ? FOUNDATION_INCLINED_X : FOUNDATION_INCLINED_Y); } @@ -62,7 +62,7 @@ index 175e776e5e..3a29647493 100644 * Should the road be drawn as a unpaved snow/desert road? * By default, roads are always drawn as unpaved if they are on desert or diff --git a/src/road_cmd.h b/src/road_cmd.h -index 3cf588dcd6..2a0da61427 100644 +index 3cf588dcd60..2a0da614270 100644 --- a/src/road_cmd.h +++ b/src/road_cmd.h @@ -14,8 +14,11 @@ @@ -78,7 +78,7 @@ index 3cf588dcd6..2a0da61427 100644 + #endif /* ROAD_CMD_H */ diff --git a/src/road_type.h b/src/road_type.h -index 5251a53923..ce9ac81518 100644 +index 5251a53923a..ce9ac815184 100644 --- a/src/road_type.h +++ b/src/road_type.h @@ -73,4 +73,11 @@ enum RoadBits { @@ -94,7 +94,7 @@ index 5251a53923..ce9ac81518 100644 + #endif /* ROAD_TYPE_H */ diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp -index bd7dced9bf..181ba027ea 100644 +index 97047700166..080d0fd565e 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -1458,7 +1458,7 @@ again: @@ -107,7 +107,7 @@ index bd7dced9bf..181ba027ea 100644 } } diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp -index f088ccf6e2..c9ac571206 100644 +index f088ccf6e2b..c9ac5712065 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -53,6 +53,7 @@ @@ -311,10 +311,10 @@ index f088ccf6e2..c9ac571206 100644 } diff --git a/src/table/sprites.h b/src/table/sprites.h -index 81d5388f99..12ef72840f 100644 +index da3bc762718..8e1f5b6a40f 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h -@@ -255,7 +255,26 @@ static const SpriteID SPR_TRUCK_STOP_DT_Y_W = SPR_ROADSTOP_BASE + 4; +@@ -260,7 +260,26 @@ static const SpriteID SPR_TRUCK_STOP_DT_Y_W = SPR_ROADSTOP_BASE + 4; static const SpriteID SPR_TRUCK_STOP_DT_Y_E = SPR_ROADSTOP_BASE + 5; static const SpriteID SPR_TRUCK_STOP_DT_X_W = SPR_ROADSTOP_BASE + 6; static const SpriteID SPR_TRUCK_STOP_DT_X_E = SPR_ROADSTOP_BASE + 7; @@ -343,7 +343,7 @@ index 81d5388f99..12ef72840f 100644 /** Tramway sprites */ static const SpriteID SPR_TRAMWAY_BASE = SPR_ROADSTOP_BASE + ROADSTOP_SPRITE_COUNT; diff --git a/src/table/station_land.h b/src/table/station_land.h -index 3327dab5dd..991c5d3bec 100644 +index 3327dab5ddd..991c5d3becc 100644 --- a/src/table/station_land.h +++ b/src/table/station_land.h @@ -777,6 +777,62 @@ static const DrawTileSeqStruct _station_display_datas_waypoint_Y[] = { @@ -432,7 +432,7 @@ index 3327dab5dd..991c5d3bec 100644 static const DrawTileSprites _station_display_datas_oilrig[] = { diff --git a/src/track_type.h b/src/track_type.h -index 2982288bba..a89fd708cd 100644 +index 2982288bba8..a89fd708cd3 100644 --- a/src/track_type.h +++ b/src/track_type.h @@ -126,4 +126,11 @@ typedef SimpleTinyEnumT<TrackdirBits, uint16> TrackdirBitsShort; diff --git a/openttd-git/underground.patch b/openttd-git/underground.patch index 3e8cec81f..006936a30 100644 --- a/openttd-git/underground.patch +++ b/openttd-git/underground.patch @@ -1,6 +1,6 @@ diff --git a/layer.txt b/layer.txt new file mode 100644 -index 0000000000..a5947189b9 +index 00000000000..a5947189b91 --- /dev/null +++ b/layer.txt @@ -0,0 +1,48 @@ @@ -53,7 +53,7 @@ index 0000000000..a5947189b9 +* Expansion of the underground station does not work (when adding cells, a new one is added) +- GF. "jumps" (the non-editable part of the station changes randomly when the station is modified) diff --git a/source.list b/source.list -index 358b16a7cd..008efc5a15 100644 +index 358b16a7cd3..008efc5a155 100644 --- a/source.list +++ b/source.list @@ -1200,3 +1200,12 @@ thread/thread.h @@ -70,7 +70,7 @@ index 358b16a7cd..008efc5a15 100644 +underground_gui.h +widgets/underground_widget.h diff --git a/src/base_station_base.h b/src/base_station_base.h -index cd512c5177..e3fcd75cd3 100644 +index cd512c51774..e3fcd75cd30 100644 --- a/src/base_station_base.h +++ b/src/base_station_base.h @@ -28,6 +28,13 @@ struct StationSpecList { @@ -97,7 +97,7 @@ index cd512c5177..e3fcd75cd3 100644 CommandCost BeforeAddTile(TileIndex tile, StationRectMode mode); CommandCost BeforeAddRect(TileIndex tile, int w, int h, StationRectMode mode); diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp -index c4aeb3a52e..9639957f6a 100644 +index c4aeb3a52e0..9639957f6ad 100644 --- a/src/clear_cmd.cpp +++ b/src/clear_cmd.cpp @@ -14,6 +14,7 @@ @@ -148,7 +148,7 @@ index c4aeb3a52e..9639957f6a 100644 } diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp -index d9155a97db..07cca44b71 100644 +index d9155a97dbb..07cca44b714 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -27,6 +27,7 @@ @@ -168,7 +168,7 @@ index d9155a97db..07cca44b71 100644 _settings_game.game_creation.map_y = FindFirstBit(MapSizeY()); _switch_mode = SM_RESTARTGAME; diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp -index b22ba5287e..dd1a2cadea 100644 +index b22ba5287ec..dd1a2cadeab 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -18,6 +18,8 @@ @@ -332,7 +332,7 @@ index b22ba5287e..dd1a2cadea 100644 /* Date. */ NWidget(NWID_HORIZONTAL), diff --git a/src/gfx_type.h b/src/gfx_type.h -index 4cfc149a86..c39d428ac3 100644 +index 7eeddb40780..39c3ed51074 100644 --- a/src/gfx_type.h +++ b/src/gfx_type.h @@ -157,6 +157,7 @@ struct DrawPixelInfo { @@ -344,7 +344,7 @@ index 4cfc149a86..c39d428ac3 100644 }; diff --git a/src/heightmap.cpp b/src/heightmap.cpp -index 17bdbbf610..6521cee6f9 100644 +index 17bdbbf6106..6521cee6f9d 100644 --- a/src/heightmap.cpp +++ b/src/heightmap.cpp @@ -16,6 +16,7 @@ @@ -366,7 +366,7 @@ index 17bdbbf610..6521cee6f9 100644 for (row = 0; (uint)row < height; row++) { for (col = 0; (uint)col < width; col++) { diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp -index d918ef16bd..f278275fae 100644 +index d918ef16bdd..f278275faeb 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -14,6 +14,7 @@ @@ -387,7 +387,7 @@ index d918ef16bd..f278275fae 100644 } diff --git a/src/landscape.cpp b/src/landscape.cpp -index 991a445ad8..77a97fe374 100644 +index 2f14a69e4bd..b383bc2b465 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -35,6 +35,7 @@ @@ -438,7 +438,7 @@ index 991a445ad8..77a97fe374 100644 static const byte _genterrain_tbl_1[5] = { 10, 22, 33, 37, 4 }; diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt -index 56cbe04a04..c971b7d3b9 100644 +index 02efdd5aa46..c8b96ca7674 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -2574,7 +2574,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Tremweg @@ -451,7 +451,7 @@ index 56cbe04a04..c971b7d3b9 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Stasie klas: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Stasie tiepe: {LTBLUE}{STRING} diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt -index 2eb29baa31..10da8acea8 100644 +index 5cccd490915..7c1f05e2dda 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -2208,7 +2208,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}مالك @@ -464,7 +464,7 @@ index 2eb29baa31..10da8acea8 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK} فئة المحطة: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}نوع المحطة: {LTBLUE}{STRING} diff --git a/src/lang/basque.txt b/src/lang/basque.txt -index 0c2e09e24d..3927a06a32 100644 +index aa57bb9f70b..46b5316681b 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -2477,7 +2477,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Tranbia @@ -477,7 +477,7 @@ index 0c2e09e24d..3927a06a32 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Geltoki mota: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Geltoki mota: {LTBLUE}{STRING} diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt -index c2e3a1435d..8dfe3c16d1 100644 +index cb79266a70a..b6fff412b0a 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -2920,7 +2920,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Улад @@ -490,7 +490,7 @@ index c2e3a1435d..8dfe3c16d1 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Кляса станцыі: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Тып станцыi: {LTBLUE}{STRING} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt -index ffa56055fd..e0bae26ad4 100644 +index 52978f65dad..1a4b979d28d 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -2591,7 +2591,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Dono da @@ -503,7 +503,7 @@ index ffa56055fd..e0bae26ad4 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Classe de Estação: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tipo de Estação: {LTBLUE}{STRING} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt -index d674c67d40..a954d74d0c 100644 +index 9066f2cdda0..44d0ea0079d 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -2519,7 +2519,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Собс @@ -516,7 +516,7 @@ index d674c67d40..a954d74d0c 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Клас на станцията: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Тип на станцията: {LTBLUE}{STRING} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt -index 57d4e57322..11dea036e1 100644 +index 15e2bff8f70..6a8c2f00b6c 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -2589,7 +2589,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propieta @@ -529,10 +529,10 @@ index 57d4e57322..11dea036e1 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Classe d'estació: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tipus d'estació: {LTBLUE}{STRING} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt -index 79b6b1d9b0..7ae94c5a51 100644 +index 2d8ecc8f9f5..b8b21a353d3 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt -@@ -2690,7 +2690,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Vlasnik +@@ -2691,7 +2691,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Vlasnik STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Vlasnik željeznice: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Područna nadležnost: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Nijedan/Nitko/Ništa @@ -542,7 +542,7 @@ index 79b6b1d9b0..7ae94c5a51 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Klasa postaje: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Vrsta postaje: {LTBLUE}{STRING} diff --git a/src/lang/czech.txt b/src/lang/czech.txt -index 17a09c6ac9..a7bfe50654 100644 +index 7d1486c9926..3388fc44aa5 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -2675,7 +2675,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Majitel @@ -555,10 +555,10 @@ index 17a09c6ac9..a7bfe50654 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Třída stanice: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Druh stanice: {LTBLUE}{STRING} diff --git a/src/lang/danish.txt b/src/lang/danish.txt -index 93fa13575c..04c36374bc 100644 +index 906e5ff1d57..c15c25198ed 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt -@@ -2582,7 +2582,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Ejer af +@@ -2595,7 +2595,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Ejer af STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Ejer af jernbane: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Lokal myndighed: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Ingen @@ -568,10 +568,10 @@ index 93fa13575c..04c36374bc 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Stationsklasse: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Stationstype: {LTBLUE}{STRING} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt -index 3a932ae17f..f97c19702c 100644 +index 1b48c5c1ff6..f8db2120374 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt -@@ -2589,7 +2589,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Eigenaar +@@ -2595,7 +2595,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Eigenaar STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Eigenaar van spoorweg: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Gemeente: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Geen @@ -581,10 +581,10 @@ index 3a932ae17f..f97c19702c 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Stationsklasse: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Stationstype: {LTBLUE}{STRING} diff --git a/src/lang/english.txt b/src/lang/english.txt -index 83406296cc..efe4e9d9bf 100644 +index 856ca2f81a1..e0698e0c6c8 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt -@@ -458,6 +458,18 @@ STR_LANDSCAPING_MENU_PLANT_TREES :Plant trees +@@ -459,6 +459,18 @@ STR_LANDSCAPING_MENU_PLANT_TREES :Plant trees STR_LANDSCAPING_MENU_PLACE_SIGN :Place sign ############ range ends here @@ -603,7 +603,7 @@ index 83406296cc..efe4e9d9bf 100644 ############ range for music menu starts STR_TOOLBAR_SOUND_MUSIC :Sound/music ############ range ends here -@@ -2594,7 +2606,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Tramway +@@ -2595,7 +2607,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Tramway STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Railway owner: {LTBLUE}{STRING1} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Local authority: {LTBLUE}{STRING1} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :None @@ -612,7 +612,7 @@ index 83406296cc..efe4e9d9bf 100644 STR_LAND_AREA_INFORMATION_BUILD_DATE :{BLACK}Built: {LTBLUE}{DATE_LONG} STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Station class: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Station type: {LTBLUE}{STRING} -@@ -5047,3 +5059,35 @@ STR_PLANE :{BLACK}{PLANE} +@@ -5051,3 +5063,35 @@ STR_PLANE :{BLACK}{PLANE} STR_SHIP :{BLACK}{SHIP} STR_TOOLBAR_RAILTYPE_VELOCITY :{STRING} ({VELOCITY}) @@ -649,7 +649,7 @@ index 83406296cc..efe4e9d9bf 100644 + +# end underground string diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt -index 403cd8eade..e7a9df289a 100644 +index 63b5461a53c..e4e5a52d9e3 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -2548,7 +2548,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Tramway @@ -662,7 +662,7 @@ index 403cd8eade..e7a9df289a 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Station class: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Station type: {LTBLUE}{STRING} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt -index 6e03e5b242..74e1c7a449 100644 +index 8e806f0e028..41487915834 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -2587,7 +2587,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Streetca @@ -675,7 +675,7 @@ index 6e03e5b242..74e1c7a449 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Station class: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Station type: {LTBLUE}{STRING} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt -index d8a78e8ed2..510b3fe915 100644 +index a6346cb35d1..0a661ebf81e 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2177,7 +2177,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Posedant @@ -688,10 +688,10 @@ index d8a78e8ed2..510b3fe915 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Stacioklaso: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Staciotipo: {LTBLUE}{STRING} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt -index 8ff3974270..9f7086134d 100644 +index 862206a4d73..3d20af53d93 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt -@@ -2631,7 +2631,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Trammite +@@ -2635,7 +2635,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Trammite STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Raudtee omanik: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Kohalik omavalitsus: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :puudub @@ -701,7 +701,7 @@ index 8ff3974270..9f7086134d 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Jaama liik: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Jaama rühm: {LTBLUE}{STRING} diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt -index 9dd30eb324..7ed313a279 100644 +index e42bfe3bfa6..07b601be9b7 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -2314,7 +2314,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Sporvogn @@ -714,7 +714,7 @@ index 9dd30eb324..7ed313a279 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Støð klassi: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Støð slag: {LTBLUE}{STRING} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt -index 86edbf439c..c08a9941f0 100644 +index 8a492614247..f18019b0467 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -2590,7 +2590,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Raitioti @@ -727,10 +727,10 @@ index 86edbf439c..c08a9941f0 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Aseman luokka: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Aseman tyyppi: {LTBLUE}{STRING} diff --git a/src/lang/french.txt b/src/lang/french.txt -index dd7198db16..e254f1f0df 100644 +index 3b108cb9ed1..2bcd14581a4 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt -@@ -2595,7 +2595,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Proprié +@@ -2596,7 +2596,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Proprié STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Propriétaire des rails{NBSP}: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Municipalité{NBSP}: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Aucune @@ -740,7 +740,7 @@ index dd7198db16..e254f1f0df 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Type de station{NBSP}: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Type de station{NBSP}: {LTBLUE}{STRING} diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt -index af5049d114..8818fbdf35 100644 +index 42e7b17554b..d452435ad8e 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -2799,7 +2799,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Seilbhea @@ -753,7 +753,7 @@ index af5049d114..8818fbdf35 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Seòrsa an stèisein: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Seòrsa an stèisein: {LTBLUE}{STRING} diff --git a/src/lang/galician.txt b/src/lang/galician.txt -index f3fddb5821..a5ab087457 100644 +index 604a82102bf..e22d1424780 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -2577,7 +2577,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propieta @@ -766,10 +766,10 @@ index f3fddb5821..a5ab087457 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Clase de estación: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tipo de estación: {LTBLUE}{STRING} diff --git a/src/lang/german.txt b/src/lang/german.txt -index 4902216617..4a71ae8b40 100644 +index 8857344f93a..cf51659237d 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt -@@ -2577,7 +2577,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Straßen +@@ -2587,7 +2587,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Straßen STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Gleiseigentümer: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Gehört zur Gemeinde: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Keine @@ -779,7 +779,7 @@ index 4902216617..4a71ae8b40 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Stationsklasse: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Stationstyp: {LTBLUE}{STRING} diff --git a/src/lang/greek.txt b/src/lang/greek.txt -index 64471ad58e..584fdd7e5d 100644 +index 76ff7a17556..7a34bb14349 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -2694,7 +2694,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Ιδιο @@ -792,7 +792,7 @@ index 64471ad58e..584fdd7e5d 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Κατηγορία σταθμού: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Τύπος σταθμού: {LTBLUE}{STRING} diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt -index bc5f563889..0323394278 100644 +index 37630feeb0d..0dd69c214ac 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -2599,7 +2599,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}:בעל @@ -805,7 +805,7 @@ index bc5f563889..0323394278 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}{LTBLUE}{STRING}: אופי התחנה STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK} {LTBLUE}{STRING}: סוג התחנה diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt -index 8eb63547f5..d6c053944c 100644 +index 1b4de73eb1e..6ca82c54ef5 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -2640,7 +2640,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}A villam @@ -818,7 +818,7 @@ index 8eb63547f5..d6c053944c 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Állomás osztálya: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Állomás típusa: {LTBLUE}{STRING} diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt -index 8b05505cfa..d1c8da4e02 100644 +index 7cb78a8398b..1af6632afec 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -2423,7 +2423,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Eigandi @@ -831,7 +831,7 @@ index 8b05505cfa..d1c8da4e02 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Tegund stöðvar: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tegund stöðvar: {LTBLUE}{STRING} diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt -index 1a7728cccc..4a3bc93c26 100644 +index 322b5840d9d..19b4111aabb 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -2584,7 +2584,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Pemilik @@ -844,7 +844,7 @@ index 1a7728cccc..4a3bc93c26 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Kelas Stasiun: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tipe Stasiun: {LTBLUE}{STRING} diff --git a/src/lang/irish.txt b/src/lang/irish.txt -index d4679ded9e..731397c9d9 100644 +index 450c8e96890..fa2f3ef1ec0 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -2573,7 +2573,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Úinéir @@ -857,7 +857,7 @@ index d4679ded9e..731397c9d9 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Aicme an stáisiúin: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Cineál stáisiúin: {LTBLUE}{STRING} diff --git a/src/lang/italian.txt b/src/lang/italian.txt -index ace459d6ec..dce27b33f4 100644 +index bd265fe7d3e..83ab4bfff73 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -2624,7 +2624,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propriet @@ -870,10 +870,10 @@ index ace459d6ec..dce27b33f4 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Tipo stazione: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tipo stazione: {LTBLUE}{STRING} diff --git a/src/lang/korean.txt b/src/lang/korean.txt -index 73cfe66b30..5ecd82ad19 100644 +index 8305819cb6e..fe9efb19ba7 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt -@@ -2591,7 +2591,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}전찻 +@@ -2596,7 +2596,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}전찻 STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}철도 소유주: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}지역 당국: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :없음 @@ -883,7 +883,7 @@ index 73cfe66b30..5ecd82ad19 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}역 분류: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}역 종류: {LTBLUE}{STRING} diff --git a/src/lang/latin.txt b/src/lang/latin.txt -index 5de041dcf7..12e21f72c8 100644 +index 5de041dcf76..12e21f72c81 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -2789,7 +2789,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Possesso @@ -896,7 +896,7 @@ index 5de041dcf7..12e21f72c8 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Classis stationis: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Typus stationis: {LTBLUE}{STRING} diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt -index 0db5c191c9..5f382dd5bb 100644 +index 34d12f9e6ad..1a8d68f197f 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -2519,7 +2519,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Dzelzce @@ -909,7 +909,7 @@ index 0db5c191c9..5f382dd5bb 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Stacijas klase: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Stacijas tips: {LTBLUE}{STRING} diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt -index f2309f9674..21f389d6fe 100644 +index 0942333483a..3894197d881 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -2792,7 +2792,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Tramvaja @@ -922,7 +922,7 @@ index f2309f9674..21f389d6fe 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Stotelės rūšis: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Stotelės tipas: {LTBLUE}{STRING} diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt -index ae7f63000d..27e63acd57 100644 +index 27e5f1594b4..d581ed669fe 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -2576,7 +2576,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Tramschi @@ -935,7 +935,7 @@ index ae7f63000d..27e63acd57 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Statiounsklass: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Statiounstyp: {LTBLUE}{STRING} diff --git a/src/lang/malay.txt b/src/lang/malay.txt -index d17a9c4437..905821ac48 100644 +index 9bdbe9f4437..55693a06382 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -2319,7 +2319,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Pemilik @@ -948,7 +948,7 @@ index d17a9c4437..905821ac48 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Kelas stesen: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Jenis stesen: {LTBLUE}{STRING} diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt -index 8573b31c8e..cd4bda5423 100644 +index 203166898a0..fa7b02c63f6 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -2580,7 +2580,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Eier av @@ -961,7 +961,7 @@ index 8573b31c8e..cd4bda5423 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Stasjonstype: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Stasjonstype: {LTBLUE}{STRING} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt -index d102229539..941784b6ce 100644 +index 28f6fb3e376..e2d8fae166b 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -2496,7 +2496,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Trikkesp @@ -974,7 +974,7 @@ index d102229539..941784b6ce 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Stasjonsklasse: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Stasjontype: {LTBLUE}{STRING} diff --git a/src/lang/polish.txt b/src/lang/polish.txt -index 6728551ac0..10adbc3450 100644 +index 039ba954f34..3e6f3d1dd40 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2968,7 +2968,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Wlascici @@ -987,10 +987,10 @@ index 6728551ac0..10adbc3450 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Rodzaj stacji: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Typ stacji: {LTBLUE}{STRING} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt -index 020f304f76..f6ae3228bd 100644 +index 1eff62076c8..388b22e79d3 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt -@@ -2577,7 +2577,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Dono da +@@ -2596,7 +2596,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Dono da STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Dono da linha férrea: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Autoridade local: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Nenhum @@ -1000,10 +1000,10 @@ index 020f304f76..f6ae3228bd 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Tipo de Estação: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tipo de Estação: {LTBLUE}{STRING} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt -index 45f6ad4158..b6db5bfbea 100644 +index 5a86b952dcb..90aee475c67 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt -@@ -2538,7 +2538,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propriet +@@ -2545,7 +2545,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propriet STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Proprietar al căii ferate: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Autoritatea locală: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Nici una @@ -1013,10 +1013,10 @@ index 45f6ad4158..b6db5bfbea 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Clasa staţiei: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tip staţie: {LTBLUE}{STRING} diff --git a/src/lang/russian.txt b/src/lang/russian.txt -index 72132ac069..b29bdbb8cf 100644 +index ed24128997e..ed979ad9635 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt -@@ -584,6 +584,18 @@ STR_LANDSCAPING_MENU_PLANT_TREES :Высадка +@@ -585,6 +585,18 @@ STR_LANDSCAPING_MENU_PLANT_TREES :Высадка STR_LANDSCAPING_MENU_PLACE_SIGN :Поставить метку ############ range ends here @@ -1035,7 +1035,7 @@ index 72132ac069..b29bdbb8cf 100644 ############ range for music menu starts STR_TOOLBAR_SOUND_MUSIC :Звук/музыка ############ range ends here -@@ -2774,7 +2786,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Влад +@@ -2775,7 +2787,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Влад STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Владелец ж/д пути: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Администрация: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Нет @@ -1044,7 +1044,7 @@ index 72132ac069..b29bdbb8cf 100644 STR_LAND_AREA_INFORMATION_BUILD_DATE :{BLACK}Построено: {LTBLUE}{DATE_LONG} STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Класс станции: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Тип станции: {LTBLUE}{STRING} -@@ -5254,3 +5266,35 @@ STR_PLANE :{BLACK}{PLANE} +@@ -5278,3 +5290,35 @@ STR_PLANE :{BLACK}{PLANE} STR_SHIP :{BLACK}{SHIP} STR_TOOLBAR_RAILTYPE_VELOCITY :{STRING} ({VELOCITY}) @@ -1081,7 +1081,7 @@ index 72132ac069..b29bdbb8cf 100644 + +# end underground string diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt -index 556d844512..46cc8b04d6 100644 +index 081e216b3bc..6104adcb445 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -2781,7 +2781,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Vlasnik @@ -1094,7 +1094,7 @@ index 556d844512..46cc8b04d6 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Klasa stanice: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Vrsta stanice: {LTBLUE}{STRING} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt -index 78365fe130..8574ad7839 100644 +index ff5c5ec4eca..11c65a9f972 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -2583,7 +2583,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}有轨 @@ -1107,7 +1107,7 @@ index 78365fe130..8574ad7839 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}车站分类: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}车站类型: {LTBLUE}{STRING} diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt -index 6ef55d7cf0..3372b571cf 100644 +index f888fe61c0b..becb74cec95 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -2641,7 +2641,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Vlastní @@ -1120,7 +1120,7 @@ index 6ef55d7cf0..3372b571cf 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Trieda stanice: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Typ stanice: {LTBLUE}{STRING} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt -index 657fa8af6f..e422324b2d 100644 +index 2e6554ce583..b8864866499 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -2727,7 +2727,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Lastnik @@ -1133,7 +1133,7 @@ index 657fa8af6f..e422324b2d 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Razred postaje: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Vrsta postaje: {LTBLUE}{STRING} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt -index fee155edfb..d5ac7f3718 100644 +index d13421cc77d..e1373f6f27b 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -2587,7 +2587,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propieta @@ -1146,10 +1146,10 @@ index fee155edfb..d5ac7f3718 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Clase de estación: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tipo de estación: {LTBLUE}{STRING} diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt -index 58a127e84b..8cc8b30ef3 100644 +index 34493d885ba..43a22b4054d 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt -@@ -2595,7 +2595,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propieta +@@ -2596,7 +2596,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propieta STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Propietario del ferrocarril: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Ayuntamiento: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Ninguno @@ -1159,10 +1159,10 @@ index 58a127e84b..8cc8b30ef3 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Clase de estación: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Tipo de estación: {LTBLUE}{STRING} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt -index 00ce1dd183..b365c45623 100644 +index 2a29a33b770..de698410a3b 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt -@@ -2576,7 +2576,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Spårvä +@@ -2594,7 +2594,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Spårvä STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Järnvägens ägare: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Lokala myndigheter: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Ingen @@ -1172,7 +1172,7 @@ index 00ce1dd183..b365c45623 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Stationsklass: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Stationstyp: {LTBLUE}{STRING} diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt -index 7985fed264..8e2cbad08f 100644 +index 24349a53e5b..9db0930032c 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -2267,7 +2267,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}ட் @@ -1185,7 +1185,7 @@ index 7985fed264..8e2cbad08f 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}நிலையத்தின் பிரிவு: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}நிலையத்தின் வகை: {LTBLUE}{STRING} diff --git a/src/lang/thai.txt b/src/lang/thai.txt -index c1e82e18f5..c6dbaf6551 100644 +index 88a78054d63..8789e2106ba 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -2522,7 +2522,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}ผู @@ -1198,7 +1198,7 @@ index c1e82e18f5..c6dbaf6551 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}ประเภทของสถานี: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}รูปแบบของสถานี: {LTBLUE}{STRING} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt -index ae1170aee8..bdbb55fd21 100644 +index 135fed42b0e..790895c2633 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -2573,7 +2573,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}電車 @@ -1211,7 +1211,7 @@ index ae1170aee8..bdbb55fd21 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}車站風格：{LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}車站種類：{LTBLUE}{STRING} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt -index ac7f22c24e..d3c641c656 100644 +index f143a3deb98..c913ca3e8ea 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -2577,7 +2577,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Tramvay @@ -1224,7 +1224,7 @@ index ac7f22c24e..d3c641c656 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}İstasyon sınıfı: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}İstasyon türü: {LTBLUE}{STRING} diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt -index cacc4210dd..89c596d8d6 100644 +index bb2e6afcb6d..8eab00d8440 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -2704,7 +2704,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Влас @@ -1237,7 +1237,7 @@ index cacc4210dd..89c596d8d6 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Клас станції: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Тип станції: {LTBLUE}{STRING} diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt -index 80059f1186..f8ea8ec62d 100644 +index eb14ae80359..a658a30e1bd 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -2277,7 +2277,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}مالک @@ -1250,7 +1250,7 @@ index 80059f1186..f8ea8ec62d 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}کلاس ایستگاه: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}نوع ایستگاه: {LTBLUE}{STRING} diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt -index e098ee47e6..77aad41eda 100644 +index 2dde004aab4..3cdf812d8b2 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -2590,7 +2590,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Chủ đ @@ -1263,7 +1263,7 @@ index e098ee47e6..77aad41eda 100644 STR_LAND_AREA_INFORMATION_STATION_CLASS :{BLACK}Loại ga,bến: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Kiểu ga,bến: {LTBLUE}{STRING} diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt -index a6444cc81c..ad24351f97 100644 +index 2ed53b3152a..927c993c8c2 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -2576,7 +2576,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Perchenn @@ -1277,7 +1277,7 @@ index a6444cc81c..ad24351f97 100644 STR_LAND_AREA_INFORMATION_STATION_TYPE :{BLACK}Math gorsaf: {LTBLUE}{STRING} diff --git a/src/layer.cpp b/src/layer.cpp new file mode 100644 -index 0000000000..6ed117c03c +index 00000000000..6ed117c03cf --- /dev/null +++ b/src/layer.cpp @@ -0,0 +1,136 @@ @@ -1419,7 +1419,7 @@ index 0000000000..6ed117c03c +} diff --git a/src/layer_func.h b/src/layer_func.h new file mode 100644 -index 0000000000..05022163a2 +index 00000000000..05022163a2d --- /dev/null +++ b/src/layer_func.h @@ -0,0 +1,102 @@ @@ -1527,7 +1527,7 @@ index 0000000000..05022163a2 +#endif /* LAYER_FUNC_H */ diff --git a/src/layer_gui.h b/src/layer_gui.h new file mode 100644 -index 0000000000..303fa32a3a +index 00000000000..303fa32a3aa --- /dev/null +++ b/src/layer_gui.h @@ -0,0 +1,17 @@ @@ -1550,7 +1550,7 @@ index 0000000000..303fa32a3a +#endif /* LAYER_GUI_H */ diff --git a/src/layer_type.h b/src/layer_type.h new file mode 100644 -index 0000000000..53eafdde63 +index 00000000000..53eafdde639 --- /dev/null +++ b/src/layer_type.h @@ -0,0 +1,22 @@ @@ -1577,7 +1577,7 @@ index 0000000000..53eafdde63 + +#endif /* LAYER_TYPE_H */ diff --git a/src/main_gui.cpp b/src/main_gui.cpp -index 2eb24c8dc2..b124a3e946 100644 +index 2eb24c8dc24..b124a3e9469 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -33,6 +33,9 @@ @@ -1636,7 +1636,7 @@ index 2eb24c8dc2..b124a3e946 100644 } diff --git a/src/map.cpp b/src/map.cpp -index 85590c3e88..c00faa18c1 100644 +index 85590c3e883..c00faa18c10 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -13,6 +13,7 @@ @@ -1676,7 +1676,7 @@ index 85590c3e88..c00faa18c1 100644 } else { return CircularTileSearch(tile, size / 2, 0, 0, proc, user_data); diff --git a/src/map_func.h b/src/map_func.h -index 21d69b1382..b0a59eb148 100644 +index 21d69b13823..b0a59eb1487 100644 --- a/src/map_func.h +++ b/src/map_func.h @@ -43,7 +43,7 @@ extern Tile *_m; @@ -1763,7 +1763,7 @@ index 21d69b1382..b0a59eb148 100644 diff --git a/src/misc.cpp b/src/misc.cpp -index d9d506993f..f5184c0581 100644 +index d9d506993fe..f5184c0581a 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -10,6 +10,7 @@ @@ -1784,7 +1784,7 @@ index d9d506993f..f5184c0581 100644 _pause_mode = PM_UNPAUSED; _fast_forward = 0; diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp -index 149ebe7177..2259f5dc72 100644 +index 149ebe71778..2259f5dc72e 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -214,10 +214,11 @@ public: @@ -1803,7 +1803,7 @@ index 149ebe7177..2259f5dc72 100644 line_nr++; diff --git a/src/rail.h b/src/rail.h -index b7258d3016..5ff4bd3a17 100644 +index b7258d30169..5ff4bd3a17c 100644 --- a/src/rail.h +++ b/src/rail.h @@ -150,7 +150,7 @@ public: @@ -1816,7 +1816,7 @@ index b7258d3016..5ff4bd3a17 100644 CursorID rail_swne; ///< Cursor for building rail in X direction CursorID rail_ew; ///< Cursor for building rail in E-W direction diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp -index a0fd968cc6..60697b636d 100644 +index a0fd968cc66..60697b636db 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -531,7 +531,7 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u @@ -1912,7 +1912,7 @@ index a0fd968cc6..60697b636d 100644 } diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp -index 175e776e5e..e33b5cb45a 100644 +index d9825c9bfae..f9d420c5d74 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -255,7 +255,7 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec @@ -1933,7 +1933,7 @@ index 175e776e5e..e33b5cb45a 100644 if (flags & DC_EXEC) { switch (GetTileType(tile)) { -@@ -1046,7 +1046,7 @@ CommandCost CmdBuildRoadDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, ui +@@ -1048,7 +1048,7 @@ CommandCost CmdBuildRoadDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, ui MarkTileDirtyByTile(tile); MakeDefaultName(dep); } @@ -1943,7 +1943,7 @@ index 175e776e5e..e33b5cb45a 100644 } diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp -index 693ddb7ce3..e2e9f4877b 100644 +index 5402ecc0d2f..deec8eef70f 100644 --- a/src/saveload/map_sl.cpp +++ b/src/saveload/map_sl.cpp @@ -11,6 +11,7 @@ @@ -1961,9 +1961,9 @@ index 693ddb7ce3..e2e9f4877b 100644 +static uint32 _layer_count; static const SaveLoadGlobVarList _map_dimensions[] = { - SLEG_CONDVAR(_map_dim_x, SLE_UINT32, 6, SL_MAX_VERSION), - SLEG_CONDVAR(_map_dim_y, SLE_UINT32, 6, SL_MAX_VERSION), -+ SLEG_CONDVAR(_layer_count, SLE_UINT32, 6, SL_MAX_VERSION), + SLEG_CONDVAR(_map_dim_x, SLE_UINT32, SLV_6, SL_MAX_VERSION), + SLEG_CONDVAR(_map_dim_y, SLE_UINT32, SLV_6, SL_MAX_VERSION), ++ SLEG_CONDVAR(_layer_count, SLE_UINT32, SLV_6, SL_MAX_VERSION), SLEG_END() }; @@ -1984,10 +1984,10 @@ index 693ddb7ce3..e2e9f4877b 100644 static void Check_MAPS() diff --git a/src/script/api/script_window.hpp b/src/script/api/script_window.hpp -index e11742bafb..2653aea504 100644 +index 8dfeafc4c58..622b5c19285 100644 --- a/src/script/api/script_window.hpp +++ b/src/script/api/script_window.hpp -@@ -1318,6 +1318,7 @@ public: +@@ -1323,6 +1323,7 @@ public: WID_GL_MAPSIZE_X_PULLDOWN = ::WID_GL_MAPSIZE_X_PULLDOWN, ///< Dropdown 'map X size'. WID_GL_MAPSIZE_Y_PULLDOWN = ::WID_GL_MAPSIZE_Y_PULLDOWN, ///< Dropdown 'map Y size'. @@ -1995,7 +1995,7 @@ index e11742bafb..2653aea504 100644 WID_GL_TOWN_PULLDOWN = ::WID_GL_TOWN_PULLDOWN, ///< Dropdown 'No. of towns'. WID_GL_INDUSTRY_PULLDOWN = ::WID_GL_INDUSTRY_PULLDOWN, ///< Dropdown 'No. of industries'. -@@ -1366,6 +1367,7 @@ public: +@@ -1371,6 +1372,7 @@ public: WID_CS_RANDOM_WORLD = ::WID_CS_RANDOM_WORLD, ///< Generate random land button WID_CS_MAPSIZE_X_PULLDOWN = ::WID_CS_MAPSIZE_X_PULLDOWN, ///< Pull-down arrow for x map size. WID_CS_MAPSIZE_Y_PULLDOWN = ::WID_CS_MAPSIZE_Y_PULLDOWN, ///< Pull-down arrow for y map size. @@ -2004,7 +2004,7 @@ index e11742bafb..2653aea504 100644 WID_CS_START_DATE_TEXT = ::WID_CS_START_DATE_TEXT, ///< Clickable start date value. WID_CS_START_DATE_UP = ::WID_CS_START_DATE_UP, ///< Increase start year (start later). diff --git a/src/settings.cpp b/src/settings.cpp -index ae797e09b9..1651b119a9 100644 +index 41d3e280927..3399297b137 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -32,6 +32,7 @@ @@ -2016,7 +2016,7 @@ index ae797e09b9..1651b119a9 100644 #include "train.h" #include "news_func.h" diff --git a/src/settings_type.h b/src/settings_type.h -index 8f03b1dc15..5bd9103168 100644 +index 8f03b1dc15b..5bd91031683 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -148,6 +148,8 @@ struct GUISettings { @@ -2037,7 +2037,7 @@ index 8f03b1dc15..5bd9103168 100644 byte oil_refinery_limit; ///< distance oil refineries allowed from map edge byte snow_line_height; ///< the configured snow line height diff --git a/src/station.cpp b/src/station.cpp -index f86286f3d9..fac559e5fd 100644 +index f86286f3d9b..fac559e5fd0 100644 --- a/src/station.cpp +++ b/src/station.cpp @@ -13,6 +13,7 @@ @@ -2159,7 +2159,7 @@ index f86286f3d9..fac559e5fd 100644 bool empty = this->AfterRemoveTile(st, ta.tile); if (ta.w != 1 || ta.h != 1) empty = empty || this->AfterRemoveTile(st, TILE_ADDXY(ta.tile, ta.w - 1, ta.h - 1)); diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp -index f088ccf6e2..c9cb419f3a 100644 +index f088ccf6e2b..c9cb419f3a4 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -13,6 +13,7 @@ @@ -2369,7 +2369,7 @@ index f088ccf6e2..c9cb419f3a 100644 AirportTileTableIterator iter(as->table[layout], tile); CommandCost cost = CheckFlatLandAirport(iter, flags); diff --git a/src/station_gui.cpp b/src/station_gui.cpp -index 5c2e06070b..a9719b5e3d 100644 +index 5c2e06070be..a9719b5e3d4 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -21,6 +21,7 @@ @@ -2431,7 +2431,7 @@ index 5c2e06070b..a9719b5e3d 100644 return NULL; } diff --git a/src/table/settings.ini b/src/table/settings.ini -index 7afdd80801..2cc24aa4d4 100644 +index 2b36e32b7c3..65ea2fd0860 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -1851,6 +1851,15 @@ min = 500 @@ -2467,7 +2467,7 @@ index 7afdd80801..2cc24aa4d4 100644 [SDTC_BOOL] ifdef = DEDICATED diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp -index 9839f5e34b..faaf01b275 100644 +index 9839f5e34b3..faaf01b275a 100644 --- a/src/terraform_cmd.cpp +++ b/src/terraform_cmd.cpp @@ -10,6 +10,7 @@ @@ -2490,7 +2490,7 @@ index 9839f5e34b..faaf01b275 100644 if (IsBridgeAbove(tile)) { int bridge_height = GetBridgeHeight(GetSouthernBridgeEnd(tile)); diff --git a/src/tgp.cpp b/src/tgp.cpp -index 02621f127e..b052223a80 100644 +index 02621f127ea..b052223a804 100644 --- a/src/tgp.cpp +++ b/src/tgp.cpp @@ -14,6 +14,7 @@ @@ -2536,7 +2536,7 @@ index 02621f127e..b052223a80 100644 int max_height = H2I(TGPGetMaxHeight()); diff --git a/src/tile_map.h b/src/tile_map.h -index 7a76f2b974..96a1418395 100644 +index 7a76f2b9741..96a14183953 100644 --- a/src/tile_map.h +++ b/src/tile_map.h @@ -16,6 +16,7 @@ @@ -2571,7 +2571,7 @@ index 7a76f2b974..96a1418395 100644 } diff --git a/src/tilearea_type.h b/src/tilearea_type.h -index 45bfb3d4c0..164781814b 100644 +index 45bfb3d4c01..164781814b0 100644 --- a/src/tilearea_type.h +++ b/src/tilearea_type.h @@ -44,6 +44,16 @@ struct OrthogonalTileArea { @@ -2592,7 +2592,7 @@ index 45bfb3d4c0..164781814b 100644 bool Contains(TileIndex tile) const; diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp -index afa9adacbd..5b5e451722 100644 +index afa9adacbd7..5b5e451722b 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -13,7 +13,10 @@ @@ -2779,7 +2779,7 @@ index afa9adacbd..5b5e451722 100644 SPR_IMG_MESSAGES, // WID_TN_MESSAGES SPR_IMG_QUERY, // WID_TN_HELP diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp -index dacf59ddc4..056491df32 100644 +index dacf59ddc43..056491df32a 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -13,6 +13,7 @@ @@ -2810,7 +2810,7 @@ index dacf59ddc4..056491df32 100644 } return CommandCost(); diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp -index 7240cf86d3..824ec2c2f9 100644 +index 7240cf86d3b..824ec2c2f90 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -13,6 +13,7 @@ @@ -2843,7 +2843,7 @@ index 7240cf86d3..824ec2c2f9 100644 if (tree_to_plant != TREE_INVALID && !IsInsideBS(tree_to_plant, _tree_base_by_landscape[_settings_game.game_creation.landscape], _tree_count_by_landscape[_settings_game.game_creation.landscape])) return CMD_ERROR; diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp -index 06dc24e84f..69466fef93 100644 +index 06dc24e84fc..69466fef93f 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -15,6 +15,7 @@ @@ -2880,7 +2880,7 @@ index 06dc24e84f..69466fef93 100644 if (start_z == end_z) break; diff --git a/src/underground_gui.cpp b/src/underground_gui.cpp new file mode 100644 -index 0000000000..406bd8cb7d +index 00000000000..406bd8cb7d1 --- /dev/null +++ b/src/underground_gui.cpp @@ -0,0 +1,321 @@ @@ -3207,7 +3207,7 @@ index 0000000000..406bd8cb7d +} diff --git a/src/underground_gui.h b/src/underground_gui.h new file mode 100644 -index 0000000000..81b119545e +index 00000000000..81b119545ec --- /dev/null +++ b/src/underground_gui.h @@ -0,0 +1,19 @@ @@ -3231,7 +3231,7 @@ index 0000000000..81b119545e + +#endif /* UNDERGROUND_GUI_H */ diff --git a/src/vehicle.cpp b/src/vehicle.cpp -index 46141ce265..2c1a635287 100644 +index 62d279db62f..0e7a7773846 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -15,6 +15,7 @@ @@ -3251,7 +3251,7 @@ index 46141ce265..2c1a635287 100644 l <= v->coord.right && t <= v->coord.bottom && diff --git a/src/viewport.cpp b/src/viewport.cpp -index cb4307f0af..035949d568 100644 +index cb4307f0afc..035949d5688 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -64,6 +64,8 @@ @@ -3292,7 +3292,7 @@ index cb4307f0af..035949d568 100644 ViewportAddVehicles(&_vd.dpi); diff --git a/src/viewport_func.h b/src/viewport_func.h -index 319d4efd60..b87ba55574 100644 +index 319d4efd600..b87ba555743 100644 --- a/src/viewport_func.h +++ b/src/viewport_func.h @@ -33,6 +33,7 @@ void MarkAllViewportsDirty(int left, int top, int right, int bottom); @@ -3304,7 +3304,7 @@ index 319d4efd60..b87ba55574 100644 void HandleZoomMessage(Window *w, const ViewPort *vp, byte widget_zoom_in, byte widget_zoom_out); diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp -index 9c89a85f84..da5772d43c 100644 +index 9c89a85f84b..da5772d43c2 100644 --- a/src/viewport_gui.cpp +++ b/src/viewport_gui.cpp @@ -16,6 +16,7 @@ @@ -3329,7 +3329,7 @@ index 9c89a85f84..da5772d43c 100644 } diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp -index 31dafe57fa..c5c7e47f27 100644 +index 31dafe57fa2..c5c7e47f27f 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -12,6 +12,7 @@ @@ -3372,7 +3372,7 @@ index 31dafe57fa..c5c7e47f27 100644 * and make shore, as that looks much better * during the generation. */ diff --git a/src/widgets/genworld_widget.h b/src/widgets/genworld_widget.h -index 877efbb921..9766a06400 100644 +index 877efbb9211..9766a064004 100644 --- a/src/widgets/genworld_widget.h +++ b/src/widgets/genworld_widget.h @@ -21,6 +21,7 @@ enum GenerateLandscapeWidgets { @@ -3392,7 +3392,7 @@ index 877efbb921..9766a06400 100644 WID_CS_START_DATE_TEXT, ///< Clickable start date value. WID_CS_START_DATE_UP, ///< Increase start year (start later). diff --git a/src/widgets/toolbar_widget.h b/src/widgets/toolbar_widget.h -index c317fc9574..280d0f969c 100644 +index c317fc9574e..280d0f969c9 100644 --- a/src/widgets/toolbar_widget.h +++ b/src/widgets/toolbar_widget.h @@ -42,6 +42,7 @@ enum ToolbarNormalWidgets { @@ -3405,7 +3405,7 @@ index c317fc9574..280d0f969c 100644 WID_TN_HELP, ///< Help menu. diff --git a/src/widgets/underground_widget.h b/src/widgets/underground_widget.h new file mode 100644 -index 0000000000..522c9db8bf +index 00000000000..522c9db8bf2 --- /dev/null +++ b/src/widgets/underground_widget.h @@ -0,0 +1,21 @@ @@ -3431,7 +3431,7 @@ index 0000000000..522c9db8bf + +#endif /* WIDGETS_UNDERGROUND_WIDGET_H */ diff --git a/src/window_type.h b/src/window_type.h -index 7185bfcb4f..85f54f0760 100644 +index 7185bfcb4f1..85f54f07602 100644 --- a/src/window_type.h +++ b/src/window_type.h @@ -443,6 +443,12 @@ enum WindowClass { |