From a98c9be15982fa24d6239ae034872f1c6be6d246 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 6 Jan 2021 15:10:37 +0100 Subject: openttd-git 29779.8596b43b2-2 -> 29816.62cdadb58-1 --- openttd-git/PKGBUILD | 29 ++++++++---------- openttd-git/chunnel.patch | 26 ++++++++-------- openttd-git/signaltunnel.patch | 26 ++++++++-------- openttd-git/sloped-stations.patch | 8 ++--- openttd-git/underground.patch | 64 +++++++++++++++++++-------------------- 5 files changed, 75 insertions(+), 78 deletions(-) (limited to 'openttd-git') diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD index 2f175d92..96469a99 100644 --- a/openttd-git/PKGBUILD +++ b/openttd-git/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Erich Eckner pkgname=openttd-git -pkgver=29779.8596b43b2 +pkgver=29816.62cdadb58 _commit=${pkgver#*.} -pkgrel=2 +pkgrel=1 pkgdesc="A FOSS clone of Transport Tycoon Deluxe." arch=('x86_64' 'i686' 'pentium4') url="http://www.openttd.org" @@ -43,21 +43,18 @@ backup=() options=() source=( "${pkgname}::git://github.com/OpenTTD/OpenTTD.git#commit=${_commit}" - "chunnel-signaltunnel-pre.patch" - "chunnel-underground-pre.patch" - "chunnel.patch" +# "chunnel-signaltunnel-pre.patch" +# "chunnel-underground-pre.patch" +# "chunnel.patch" "signaltunnel.patch" "sloped-stations.patch" "underground.patch" 'opntitle.dat' ) sha512sums=('SKIP' - '26fa515d2706455f0f713ef8aab80fb2a52f665b54ae354d3feab2c25e194f80187125a28429a25ad86b58a2e902862aeb1ebae74e36d974ec78f4304df94b61' - '09200144aa4dd5beaf12787d175aa47226205427721c05f681730474a95a2d2f8692be63df568c622f78edf81347dec249d0926203be3aa6dd902ff93f7aa047' - '74283b8adb001a010aa05a8cee33b620371544e2909317f4c7156852e4ea440cdf8793dbe8957d646734ee309fdb5924915e0d967d78d43329ea4fc211e7e8ef' - '497f395320edff647dd58c53abc451f706db9934fc847c95ecbbb33d519f67fe94ecd913e13bd7d770320370ea088b675e6583e8b59b69e2d3ee587a62ad2261' - '11c87d30824bca5738e46c14422c622cdfe4d7e55a5b3a4fe5e77a0a14ceee742bfa8f6c0e8212e9b38c2a1d1db3a4f525c7a70a0b0ed03751dee2539d3da929' - 'f18a389800e5641ebc55d4322089d97a851125ae6d19ff944d3648b3b603128fe0fcb7ba2210cbd13ac8a0839003144299c217b994bdc0bc5e601fbff63308d2' + '29659bf030f7cc75ccf7009ccb10a0c0316ae7883a2359e5e6ed95caacc48d8d6eeb922b411c00be53293f508c4c847cd7e4568e2d9f9b4dbc3f3019002f61e1' + '9a2c5ae425dfed43d896c445f76a79b77d3d4134ff3d89a894c9ac7d13ca08fb4f7b94c33c4b83cf834a5f3026c466736f50841ccd40b9c8df4d7abafb655898' + 'b3911b63a155b420e6a46bf7607bc4f412870c4fff3cee2754ab702f3c795a700599c7c22a88a7230856ed5eb4f104fde82b397ab7b542f140a16d991095a247' 'a3fd5b230b7cdd67a1b6607887433c0cb85ba1dfd30cedfddf573a58b23ccce7c470a22cf7f65a29c173bba12976c5889482cef24f49c8c0a829883a71bcd87d') pkgver() { @@ -73,9 +70,9 @@ pkgver() { prepare() { cd "${srcdir}" - cp chunnel.patch chunnel.pre.patch - patch -p1 -i "chunnel-signaltunnel-pre.patch" - patch -p1 -i "chunnel-underground-pre.patch" +# cp chunnel.patch chunnel.pre.patch +# patch -p1 -i "chunnel-signaltunnel-pre.patch" +# patch -p1 -i "chunnel-underground-pre.patch" cd "${srcdir}/${pkgname}" cp "${srcdir}/opntitle.dat" media/baseset/ @@ -100,8 +97,8 @@ prepare() { s,"\${CMAKE_SOURCE_DIR}/\.git","/dev/does/not/exist", ' cmake/scripts/FindVersion.cmake -# for _p in "${srcdir}/"{signaltunnel,sloped-stations,underground}.patch; do - for _p in "${srcdir}/"{signaltunnel,underground,chunnel.pre}.patch; do +# for _p in "${srcdir}/"{signaltunnel,sloped-stations,underground,chunnel.pre}.patch; do + for _p in "${srcdir}/"{signaltunnel,underground}.patch; do >&2 echo "patching ${_p##*/} ..." patch -p1 -i "${_p}" >&2 echo "... ok" diff --git a/openttd-git/chunnel.patch b/openttd-git/chunnel.patch index 33ab7405..4071429f 100644 --- a/openttd-git/chunnel.patch +++ b/openttd-git/chunnel.patch @@ -169,10 +169,10 @@ index 816146212f..5491936557 100644 } diff --git a/src/lang/english.txt b/src/lang/english.txt -index 1751e360f0..ce8baa7a4c 100644 +index 8d8a128717..765fc146a1 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt -@@ -2325,6 +2325,7 @@ STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Toggle t +@@ -2321,6 +2321,7 @@ STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Toggle t STR_TRANSPARENT_STRUCTURES_TOOLTIP :{BLACK}Toggle transparency for structures like lighthouses and antennas. Ctrl+Click to lock STR_TRANSPARENT_CATENARY_TOOLTIP :{BLACK}Toggle transparency for catenary. Ctrl+Click to lock STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Toggle transparency for loading indicators. Ctrl+Click to lock @@ -180,7 +180,7 @@ index 1751e360f0..ce8baa7a4c 100644 STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Set objects invisible instead of transparent # Linkgraph legend window -@@ -2724,7 +2725,9 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot +@@ -2720,7 +2721,9 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot # Industries come directly from their industry names STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Railway tunnel @@ -202,10 +202,10 @@ index 1751e360f0..ce8baa7a4c 100644 # Object related errors STR_ERROR_TOO_MANY_OBJECTS :{WHITE}... too many objects diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp -index 0e490fbc21..73c4648926 100644 +index 14fa8d79d8..604b51ea46 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp -@@ -1182,6 +1182,7 @@ bool IndividualRoadVehicleController(RoadVehicle *v, const RoadVehicle *prev) +@@ -1178,6 +1178,7 @@ bool IndividualRoadVehicleController(RoadVehicle *v, const RoadVehicle *prev) v->x_pos = gp.x; v->y_pos = gp.y; v->UpdatePosition(); @@ -213,7 +213,7 @@ index 0e490fbc21..73c4648926 100644 if ((v->vehstatus & VS_HIDDEN) == 0) v->Vehicle::UpdateViewport(true); return true; } -@@ -1549,7 +1550,7 @@ again: +@@ -1545,7 +1546,7 @@ again: v->x_pos = x; v->y_pos = y; v->UpdatePosition(); @@ -425,7 +425,7 @@ index 85edb73128..1a902dd59c 100644 return_cmd_error(STR_ERROR_EXCAVATION_WOULD_DAMAGE); } diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp -index 5d02764b55..cc0455f8f9 100644 +index ae9cb45de3..a9ca119ec3 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1563,6 +1563,7 @@ static void UpdateStatusAfterSwap(Train *v) @@ -987,7 +987,7 @@ index 62d3c14b2d..37e00457e4 100644 /** diff --git a/src/vehicle.cpp b/src/vehicle.cpp -index e014944a9f..cb6239f597 100644 +index e358421186..da107682f0 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -285,6 +285,14 @@ uint Vehicle::Crash(bool flooded) @@ -1014,16 +1014,16 @@ index e014944a9f..cb6239f597 100644 if (v->type == VEH_EFFECT) { /* Check whether the vehicle shall be transparent/invisible due to GUI settings. -@@ -1139,7 +1147,7 @@ void ViewportAddVehicles(DrawPixelInfo *dpi) - const Vehicle *v = _vehicle_viewport_hash[x + y]; // already masked & 0xFFF +@@ -1155,7 +1163,7 @@ void ViewportAddVehicles(DrawPixelInfo *dpi) while (v != nullptr) { + - if (!(v->vehstatus & VS_HIDDEN) && + if (v->IsDrawn() && l <= v->coord.right && t <= v->coord.bottom && r >= v->coord.left && -@@ -1174,7 +1182,7 @@ Vehicle *CheckClickOnVehicle(const Viewport *vp, int x, int y) +@@ -1209,7 +1217,7 @@ Vehicle *CheckClickOnVehicle(const Viewport *vp, int x, int y) y = ScaleByZoom(y, vp->zoom) + vp->virtual_top; for (Vehicle *v : Vehicle::Iterate()) { @@ -1033,10 +1033,10 @@ index e014944a9f..cb6239f597 100644 y >= v->coord.top && y <= v->coord.bottom) { diff --git a/src/vehicle_base.h b/src/vehicle_base.h -index 019c94a29a..2378b84473 100644 +index 24facfb3e4..f3a964261c 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h -@@ -351,6 +351,12 @@ public: +@@ -363,6 +363,12 @@ public: uint GetConsistTotalCapacity() const; diff --git a/openttd-git/signaltunnel.patch b/openttd-git/signaltunnel.patch index c3496648..aef9cfda 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 1751e360f0..0b7f53917b 100644 +index 8d8a128717..6fab1dd1cf 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1575,6 +1575,8 @@ STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimum company @@ -11,7 +11,7 @@ index 1751e360f0..0b7f53917b 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} -@@ -2724,8 +2726,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot +@@ -2720,8 +2722,10 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Ship depot # Industries come directly from their industry names STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Railway tunnel @@ -69,10 +69,10 @@ index 2cfe4d9e4a..dbf225d785 100644 return false; } diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp -index a714415326..fa76640f8d 100644 +index 34ad07d520..5e9719f4a1 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp -@@ -1059,9 +1059,12 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, +@@ -1055,9 +1055,12 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, if (sigtype > SIGTYPE_LAST) return CMD_ERROR; if (cycle_start > cycle_stop || cycle_stop > SIGTYPE_LAST) return CMD_ERROR; @@ -88,7 +88,7 @@ index a714415326..fa76640f8d 100644 return_cmd_error(STR_ERROR_THERE_IS_NO_RAILROAD_TRACK); } /* Protect against invalid signal copying */ -@@ -1070,6 +1073,53 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, +@@ -1066,6 +1069,53 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, CommandCost ret = CheckTileOwnership(tile); if (ret.Failed()) return ret; @@ -142,7 +142,7 @@ index a714415326..fa76640f8d 100644 /* See if this is a valid track combination for signals (no overlap) */ if (TracksOverlap(GetTrackBits(tile))) return_cmd_error(STR_ERROR_NO_SUITABLE_RAILROAD_TRACK); -@@ -1079,7 +1129,6 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, +@@ -1075,7 +1125,6 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, /* you can not convert a signal if no signal is on track */ if (convert_signal && !HasSignalOnTrack(tile, track)) return_cmd_error(STR_ERROR_THERE_ARE_NO_SIGNALS); @@ -150,7 +150,7 @@ index a714415326..fa76640f8d 100644 if (!HasSignalOnTrack(tile, track)) { /* build new signals */ cost = CommandCost(EXPENSES_CONSTRUCTION, _price[PR_BUILD_SIGNALS]); -@@ -1237,6 +1286,7 @@ static bool CheckSignalAutoFill(TileIndex &tile, Trackdir &trackdir, int &signal +@@ -1233,6 +1282,7 @@ static bool CheckSignalAutoFill(TileIndex &tile, Trackdir &trackdir, int &signal return true; case MP_TUNNELBRIDGE: { @@ -158,7 +158,7 @@ index a714415326..fa76640f8d 100644 TileIndex orig_tile = tile; // backup old value if (GetTunnelBridgeTransportType(tile) != TRANSPORT_RAIL) return false; -@@ -1348,7 +1398,8 @@ static CommandCost CmdSignalTrackHelper(TileIndex tile, DoCommandFlag flags, uin +@@ -1344,7 +1394,8 @@ static CommandCost CmdSignalTrackHelper(TileIndex tile, DoCommandFlag flags, uin bool had_success = false; for (;;) { /* only build/remove signals with the specified density */ @@ -168,7 +168,7 @@ index a714415326..fa76640f8d 100644 uint32 p1 = GB(TrackdirToTrack(trackdir), 0, 3); SB(p1, 3, 1, mode); SB(p1, 4, 1, semaphores); -@@ -1384,13 +1435,20 @@ static CommandCost CmdSignalTrackHelper(TileIndex tile, DoCommandFlag flags, uin +@@ -1380,13 +1431,20 @@ static CommandCost CmdSignalTrackHelper(TileIndex tile, DoCommandFlag flags, uin /* Collect cost. */ if (!test_only) { @@ -195,7 +195,7 @@ index a714415326..fa76640f8d 100644 /* The "No railway" error is the least important one. */ if (ret.GetErrorMessage() != STR_ERROR_THERE_IS_NO_RAILROAD_TRACK || last_error.GetErrorMessage() == INVALID_STRING_ID) { -@@ -1461,22 +1519,48 @@ CommandCost CmdBuildSignalTrack(TileIndex tile, DoCommandFlag flags, uint32 p1, +@@ -1457,22 +1515,48 @@ CommandCost CmdBuildSignalTrack(TileIndex tile, DoCommandFlag flags, uint32 p1, CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { Track track = Extract(p1); @@ -251,7 +251,7 @@ index a714415326..fa76640f8d 100644 Train *v = nullptr; if (HasReservedTracks(tile, TrackToTrackBits(track))) { v = GetTrainForReservation(tile, track); -@@ -1512,7 +1596,7 @@ CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1 +@@ -1508,7 +1592,7 @@ CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1 MarkTileDirtyByTile(tile); } @@ -366,7 +366,7 @@ index d6795e3b5c..6a7eca6b64 100644 case MP_RAILWAY: diff --git a/src/table/settings.ini b/src/table/settings.ini -index b75dd0ff28..2a594b6fa6 100644 +index 517f2fb44d..6ee429b9e1 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 b75dd0ff28..2a594b6fa6 100644 [SDT_NULL] length = 1 diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp -index 5d02764b55..1eddbf665e 100644 +index ae9cb45de3..1d3c30c49d 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1845,6 +1845,17 @@ void ReverseTrainDirection(Train *v) diff --git a/openttd-git/sloped-stations.patch b/openttd-git/sloped-stations.patch index 7978f3c4..b2421327 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 a714415326..120daf052e 100644 +index 34ad07d520..3cbca75711 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -187,14 +187,6 @@ RailType AllocateRailType(RailTypeLabel label) @@ -18,7 +18,7 @@ index a714415326..120daf052e 100644 * --------- * |\ /| diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp -index d0104cb99a..ac093c3dcc 100644 +index 79048b9b59..748fe525e1 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -37,6 +37,7 @@ @@ -94,10 +94,10 @@ index 969b141ba2..1af4275eb9 100644 + #endif /* ROAD_TYPE_H */ diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp -index 0e490fbc21..7b37f0266b 100644 +index 14fa8d79d8..106aa9a7d4 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp -@@ -1500,7 +1500,7 @@ again: +@@ -1496,7 +1496,7 @@ again: v->x_pos = x; v->y_pos = y; v->UpdatePosition(); 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 @@ -- cgit v1.2.3-54-g00ecf