diff options
Diffstat (limited to 'openttd-git/underground.patch')
-rw-r--r-- | openttd-git/underground.patch | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/openttd-git/underground.patch b/openttd-git/underground.patch index 0b3851e9..c900b54b 100644 --- a/openttd-git/underground.patch +++ b/openttd-git/underground.patch @@ -196,7 +196,7 @@ index d2066df2b7..23ac316bc2 100644 _settings_game.game_creation.map_y = FindFirstBit(MapSizeY()); _switch_mode = SM_RESTARTGAME; diff --git a/src/disaster_vehicle.cpp b/src/disaster_vehicle.cpp -index 1244f99aba..6d5defaace 100644 +index 12217bb612..8c761be2ab 100644 --- a/src/disaster_vehicle.cpp +++ b/src/disaster_vehicle.cpp @@ -325,7 +325,7 @@ static bool DisasterTick_Ufo(DisasterVehicle *v) @@ -627,10 +627,10 @@ index 752df0fb91..a3d750e80c 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 31d30d0c81..2f61b8a95d 100644 +index 87556f135f..84801fdfa3 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt -@@ -2618,7 +2618,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propieta +@@ -2642,7 +2642,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propieta STR_LAND_AREA_INFORMATION_RAIL_OWNER :{BLACK}Propietari del rail: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY :{BLACK}Autoritat Local: {LTBLUE}{STRING} STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE :Cap @@ -692,7 +692,7 @@ index d911f68383..5194a0bc0d 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 1751e360f0..8a79d87ea6 100644 +index 8d8a128717..ea952678ce 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -472,6 +472,18 @@ STR_LANDSCAPING_MENU_PLANT_TREES :Plant trees @@ -714,7 +714,7 @@ index 1751e360f0..8a79d87ea6 100644 ############ range for music menu starts STR_TOOLBAR_SOUND_MUSIC :Sound/music ############ range ends here -@@ -2641,7 +2653,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Tramway +@@ -2637,7 +2649,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 @@ -825,7 +825,7 @@ index f439165102..3d4c789743 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 f261bb44bd..6d26dbc381 100644 +index 550c182a17..327403b922 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -2641,7 +2641,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Raitioti @@ -1085,7 +1085,7 @@ index 67dece30cd..17e6e760c9 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 33b1b1f976..bccf6f03b4 100644 +index 97609d63b0..197c1bbdbc 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3021,7 +3021,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Właści @@ -1257,7 +1257,7 @@ index fe540d34be..651af10537 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 38c8e10991..11a53e1aa6 100644 +index bdde20683d..90546ef3d6 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -2642,7 +2642,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}Propieta @@ -1348,10 +1348,10 @@ index ee6148fa31..1cc1160d19 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 06632f810c..1a821bb9e7 100644 +index 58ccc03949..a4c2a681af 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt -@@ -2251,7 +2251,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}مالک +@@ -2256,7 +2256,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 :هیچکدام @@ -1688,7 +1688,7 @@ index 0000000000..53eafdde63 + +#endif /* LAYER_TYPE_H */ diff --git a/src/main_gui.cpp b/src/main_gui.cpp -index 5877fb9387..7d3babb212 100644 +index a1d37d0f13..4fefec6553 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -33,6 +33,9 @@ @@ -1701,7 +1701,7 @@ index 5877fb9387..7d3babb212 100644 #include "saveload/saveload.h" -@@ -104,7 +107,7 @@ bool HandlePlacePushButton(Window *w, int widget, CursorID cursor, HighLightStyl +@@ -65,7 +68,7 @@ bool HandlePlacePushButton(Window *w, int widget, CursorID cursor, HighLightStyl if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP); w->SetDirty(); @@ -1710,7 +1710,7 @@ index 5877fb9387..7d3babb212 100644 ResetObjectToPlace(); return false; } -@@ -199,6 +202,22 @@ void ZoomInOrOutToCursorWindow(bool in, Window *w) +@@ -152,6 +155,22 @@ void ZoomInOrOutToCursorWindow(bool in, Window *w) } } @@ -1733,7 +1733,7 @@ index 5877fb9387..7d3babb212 100644 void FixTitleGameZoom() { if (_game_mode != GM_MENU) return; -@@ -456,7 +475,11 @@ struct MainWindow : Window +@@ -409,7 +428,11 @@ struct MainWindow : Window void OnMouseWheel(int wheel) override { if (_settings_client.gui.scrollwheel_scrolling != 2) { @@ -1895,7 +1895,7 @@ index dcb04fa026..0e28216300 100644 _pause_mode = PM_UNPAUSED; _fast_forward = 0; diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp -index 17a460bf55..147aa54464 100644 +index c78bd05efb..5544f7d9db 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -216,10 +216,11 @@ public: @@ -1949,10 +1949,10 @@ index d9121d545a..ee27f6e179 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 a714415326..5fa6f68fec 100644 +index 34ad07d520..0d013abc92 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp -@@ -533,12 +533,12 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u +@@ -529,12 +529,12 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u uint num_new_road_pieces = (road != ROAD_NONE) ? 2 - CountBits(road) : 0; if (num_new_road_pieces > 0) { @@ -1967,7 +1967,7 @@ index a714415326..5fa6f68fec 100644 } if (flags & DC_EXEC) { -@@ -601,7 +601,7 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u +@@ -597,7 +597,7 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u YapfNotifyTrackLayoutChange(tile, track); } @@ -1976,7 +1976,7 @@ index a714415326..5fa6f68fec 100644 return cost; } -@@ -645,7 +645,7 @@ CommandCost CmdRemoveSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, +@@ -641,7 +641,7 @@ CommandCost CmdRemoveSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, if (ret.Failed()) return ret; } @@ -1985,7 +1985,7 @@ index a714415326..5fa6f68fec 100644 if (flags & DC_EXEC) { if (HasReservedTracks(tile, trackbit)) { -@@ -679,7 +679,7 @@ CommandCost CmdRemoveSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, +@@ -675,7 +675,7 @@ CommandCost CmdRemoveSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, if ((present & trackbit) == 0) return_cmd_error(STR_ERROR_THERE_IS_NO_RAILROAD_TRACK); if (present == (TRACK_BIT_X | TRACK_BIT_Y)) crossing = true; @@ -1994,7 +1994,7 @@ index a714415326..5fa6f68fec 100644 /* Charge extra to remove signals on the track, if they are there */ if (HasSignalOnTrack(tile, track)) { -@@ -994,7 +994,7 @@ CommandCost CmdBuildTrainDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, u +@@ -990,7 +990,7 @@ CommandCost CmdBuildTrainDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, u if (!_settings_game.construction.build_on_slopes || !CanBuildDepotByTileh(dir, tileh)) { return_cmd_error(STR_ERROR_FLAT_LAND_REQUIRED); } @@ -2003,7 +2003,7 @@ index a714415326..5fa6f68fec 100644 } cost.AddCost(DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR)); -@@ -1019,8 +1019,8 @@ CommandCost CmdBuildTrainDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, u +@@ -1015,8 +1015,8 @@ CommandCost CmdBuildTrainDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, u YapfNotifyTrackLayoutChange(tile, DiagDirToDiagTrack(dir)); } @@ -2014,7 +2014,7 @@ index a714415326..5fa6f68fec 100644 return cost; } -@@ -1672,7 +1672,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 +@@ -1668,7 +1668,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 InvalidateWindowData(WC_BUILD_VEHICLE, tile); } found_convertible_track = true; @@ -2023,7 +2023,7 @@ index a714415326..5fa6f68fec 100644 break; default: // RAIL_TILE_NORMAL, RAIL_TILE_SIGNALS -@@ -1684,7 +1684,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 +@@ -1680,7 +1680,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 } } found_convertible_track = true; @@ -2032,7 +2032,7 @@ index a714415326..5fa6f68fec 100644 break; } break; -@@ -1747,7 +1747,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 +@@ -1743,7 +1743,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 } found_convertible_track = true; @@ -2041,7 +2041,7 @@ index a714415326..5fa6f68fec 100644 break; } -@@ -1758,7 +1758,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 +@@ -1754,7 +1754,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 } found_convertible_track = true; @@ -2051,7 +2051,7 @@ index a714415326..5fa6f68fec 100644 } diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp -index d0104cb99a..687e3309b3 100644 +index 79048b9b59..a13fe934ed 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -402,7 +402,7 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec @@ -2547,7 +2547,7 @@ index 3cd4a42916..6868e72f28 100644 return nullptr; } diff --git a/src/table/settings.ini b/src/table/settings.ini -index b75dd0ff28..917e54af16 100644 +index 517f2fb44d..2927b506ed 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -1918,6 +1918,15 @@ min = 500 @@ -3401,7 +3401,7 @@ index 0000000000..81b119545e + +#endif /* UNDERGROUND_GUI_H */ diff --git a/src/vehicle.cpp b/src/vehicle.cpp -index e014944a9f..956b449602 100644 +index e358421186..0d3a87dca5 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -13,6 +13,7 @@ @@ -3412,10 +3412,10 @@ index e014944a9f..956b449602 100644 #include "viewport_func.h" #include "news_func.h" #include "command_func.h" -@@ -1139,6 +1140,7 @@ void ViewportAddVehicles(DrawPixelInfo *dpi) - const Vehicle *v = _vehicle_viewport_hash[x + y]; // already masked & 0xFFF +@@ -1155,6 +1156,7 @@ void ViewportAddVehicles(DrawPixelInfo *dpi) while (v != nullptr) { + + if (LayerIndex(v->tile) == dpi->layer) if (!(v->vehstatus & VS_HIDDEN) && l <= v->coord.right && @@ -3526,7 +3526,7 @@ index 5047f04f3f..3c02f9ab8b 100644 } diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp -index 5e37c16dd7..29541fb72d 100644 +index 6a3b730657..02a4d45156 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -10,6 +10,7 @@ |