From bd59e0a3b9e080a94a9a46aa538938bcb67ce03b Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sun, 7 Jul 2019 23:34:05 +0200 Subject: openttd-git: 29006.a0c78c73e-1 -> 29012.1e723934a-1 --- openttd-git/PKGBUILD | 8 ++++---- openttd-git/signaltunnel.patch | 2 +- openttd-git/sloped-stations.patch | 4 ++-- openttd-git/underground.patch | 24 ++++++++++++------------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD index 93a9b52a..641b58e6 100644 --- a/openttd-git/PKGBUILD +++ b/openttd-git/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Erich Eckner pkgname=openttd-git -pkgver=29006.a0c78c73e +pkgver=29012.1e723934a _commit=${pkgver#*.} pkgrel=1 pkgdesc="A FOSS clone of Transport Tycoon Deluxe." @@ -39,9 +39,9 @@ source=( "underground.patch" ) sha512sums=('SKIP' - 'cfee0dc210d8003f64f1910c8e86210aacc36898c715499d58c513d3499a426493cffcaeeccf9fd4a3600a0b957288bf531ee243e7a30f485729cbda10b9ff05' - 'e758e4a393ba504a3838676ef7f46fe2e7f7b4d85fc8053a176e675c588a55c4883f3fa5bcef9d9e4abd88a0318020d997f4e91b8f91add24d3c83f8a861b4be' - 'b1d5a2b4b69c84898138527776c8cfa9c797bef5ca6ba41d5f679195bcbb6f0fd5dcfa0d2dbc6206057cda73b7dfab96421f3ce6f3a5c94b240fcbc77d8a8dcb') + '347edcf329e082b82d80504a2e08040706a72d74dbaede87be719e121c46ff3a02d20b8c59bfa99d3925cc1f10a76d51e29d83f5fe4b1d18421d72d5b80ece96' + '2f6a2fbd6931330f84611c5256ebdbf003484e83c85aeaea13a298b75159ef0256072b4094a2c8c92a8f5a912e695a738ed3b9ca9b05da2bf9396b19970a55cd' + '9aefde1091be171c5d4747a331a9cb56e0b9a9dcc16c5a78545249755a8e1d3b3af2b47fcc4981d96101c8450ed09f0cc775c9079918042cd0afcfd3dfe731ec') pkgver() { printf '%s.%s\n' \ diff --git a/openttd-git/signaltunnel.patch b/openttd-git/signaltunnel.patch index dd062060..236afd3c 100644 --- a/openttd-git/signaltunnel.patch +++ b/openttd-git/signaltunnel.patch @@ -69,7 +69,7 @@ index 31a78165091..3442e6f796f 100644 return false; } diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp -index df862d4f215..0dbb856505a 100644 +index 1a4728c6c30..0194656c7ed 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -1062,9 +1062,12 @@ CommandCost CmdBuildSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1, diff --git a/openttd-git/sloped-stations.patch b/openttd-git/sloped-stations.patch index 699623c8..1d1a9c75 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 df862d4f215..82aa2a6f33a 100644 +index 1a4728c6c30..67475164b45 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -189,14 +189,6 @@ RailType AllocateRailType(RailTypeLabel label) @@ -18,7 +18,7 @@ index df862d4f215..82aa2a6f33a 100644 * --------- * |\ /| diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp -index 87da8186ce2..a6176ed8d5f 100644 +index 4f5519c31ec..42fcd067c3c 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -39,6 +39,7 @@ diff --git a/openttd-git/underground.patch b/openttd-git/underground.patch index 8a0ae5ca..b0fd481a 100644 --- a/openttd-git/underground.patch +++ b/openttd-git/underground.patch @@ -445,7 +445,7 @@ index 8340207dc36..30485b0ffd7 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 a2227de0ef2..70734aba754 100644 +index cb558aa3a4e..4e08bd22b50 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -2205,7 +2205,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}مالك @@ -864,7 +864,7 @@ index c3e23286c32..94677276faa 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 8e75e171c39..4306290ae4b 100644 +index c91b052cff5..e0d5fcc40d5 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -2621,7 +2621,7 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER :{BLACK}전찻 @@ -1810,7 +1810,7 @@ index 8619bac6d91..c22b1d2cbc8 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 df862d4f215..6fddd976b29 100644 +index 1a4728c6c30..0181644b52a 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -535,12 +535,12 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u @@ -1875,44 +1875,44 @@ index df862d4f215..6fddd976b29 100644 return cost; } -@@ -1673,7 +1673,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 - InvalidateWindowData(WC_VEHICLE_DEPOT, tile); +@@ -1675,7 +1675,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 InvalidateWindowData(WC_BUILD_VEHICLE, tile); } + found_convertible_track = true; - cost.AddCost(RailConvertCost(type, totype)); + cost.AddCost(RailConvertCost(type, totype) * UNDERGROUND_COST_MULTIPLIER(tile)); break; default: // RAIL_TILE_NORMAL, RAIL_TILE_SIGNALS -@@ -1684,7 +1684,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 - YapfNotifyTrackLayoutChange(tile, RemoveFirstTrack(&tracks)); +@@ -1687,7 +1687,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 } } + found_convertible_track = true; - cost.AddCost(RailConvertCost(type, totype) * CountBits(GetTrackBits(tile))); + cost.AddCost(RailConvertCost(type, totype) * CountBits(GetTrackBits(tile)) * UNDERGROUND_COST_MULTIPLIER(tile)); break; } break; -@@ -1746,7 +1746,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 - } +@@ -1750,7 +1750,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 } + found_convertible_track = true; - cost.AddCost((GetTunnelBridgeLength(tile, endtile) + 2) * RailConvertCost(type, totype)); + cost.AddCost((GetTunnelBridgeLength(tile, endtile) + 2) * RailConvertCost(type, totype) * UNDERGROUND_COST_MULTIPLIER(tile)); break; } -@@ -1756,7 +1756,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 - YapfNotifyTrackLayoutChange(tile, track); +@@ -1761,7 +1761,7 @@ CommandCost CmdConvertRail(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 } + found_convertible_track = true; - cost.AddCost(RailConvertCost(type, totype)); + cost.AddCost(RailConvertCost(type, totype) * UNDERGROUND_COST_MULTIPLIER(tile)); break; } diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp -index 87da8186ce2..19e677cab09 100644 +index 4f5519c31ec..b88f621375c 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -407,7 +407,7 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec -- cgit v1.2.3-54-g00ecf