From 793568635372cad20ee47ac74a821a840bbb57aa Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 15 Apr 2019 06:56:04 +0200 Subject: openttd-git: 28845.5bd2b15e86 -> 28854.4f052fc2a4 --- manualPorts/openttd-git/.md5sum | 8 ++--- manualPorts/openttd-git/.signature | 12 +++---- manualPorts/openttd-git/Pkgfile | 2 +- manualPorts/openttd-git/signaltunnel.patch | 2 +- manualPorts/openttd-git/sloped-stations.patch | 20 +++++------ manualPorts/openttd-git/underground.patch | 48 +++++++++++++-------------- 6 files changed, 45 insertions(+), 47 deletions(-) (limited to 'manualPorts/openttd-git') diff --git a/manualPorts/openttd-git/.md5sum b/manualPorts/openttd-git/.md5sum index 556e277..600fc71 100644 --- a/manualPorts/openttd-git/.md5sum +++ b/manualPorts/openttd-git/.md5sum @@ -1,7 +1,7 @@ -302fe927da5c5680653390e3fb931191 5bd2b15e86.tar.gz +df354fcdc0c7f72664e1a465277fd544 4f052fc2a4.tar.gz 4f4a6465cd5b84964b7ceecd1c06d686 opengfx-0.5.4.zip 858b79d44aea6de5e15d9d1439e86cc3 openmsx-0.3.1.zip 6e3a5cf97fe69e3a351c3e0615a14b04 opensfx-0.2.3.zip -aad45a895b3fc3a72b8238ca748af545 signaltunnel.patch -990fcd12c90dcf44ca18dcc5dd5d07ba sloped-stations.patch -e189cc1b0b77e8942e71e2fb258dd0c7 underground.patch +c30f66b76a8941ca01b1cb7674cf29c2 signaltunnel.patch +5cc56bd38c4b15323a923b521af12ae8 sloped-stations.patch +25e80dbfbfd1a4fab9bd8f7222012ca1 underground.patch diff --git a/manualPorts/openttd-git/.signature b/manualPorts/openttd-git/.signature index 9cd17f8..aecc56c 100644 --- a/manualPorts/openttd-git/.signature +++ b/manualPorts/openttd-git/.signature @@ -1,11 +1,11 @@ untrusted comment: verify with /etc/ports/deepthought.pub -RWQxCptPusLGGuKi0ooCcfPhUBNa00ZJB4cjIdByYG+Ykr2nifOPR2RGVvtzqskyMMfdIMHbKfdjfIQ0wUyRQVuxhN01jxauUQc= -SHA256 (Pkgfile) = c70a5422f0dd86fbc58380a340f9f49d612cbd38f6ca726de66c5907540c9b42 +RWQxCptPusLGGmOajBwZbMmTrfCKHwo/jTJQ9GTHhaCU9kNAQJHQf1w4TZ25Z1bwk0cUBjgvkMX4oFL0JCtag4TWrA/mLcfnRQc= +SHA256 (Pkgfile) = 8604496461dd0f66012a3de9776d346ad5647464c16a3a45883026b37080fdd5 SHA256 (.footprint) = 477fc931cd1de83ab810163be2d7e43e97bf3c25c3eb724c5abeaf79ed19493f SHA256 (opengfx-0.5.4.zip) = 3d136d776906dbe8b5df1434cb9a68d1249511a3c4cfaca55cc24cc0028ae078 SHA256 (opensfx-0.2.3.zip) = 3574745ac0c138bae53b56972591db8d778ad9faffd51deae37a48a563e71662 SHA256 (openmsx-0.3.1.zip) = 92e293ae89f13ad679f43185e83fb81fb8cad47fe63f4af3d3d9f955130460f5 -SHA256 (signaltunnel.patch) = a15d8a6633757f7b0c21e685d936aa5eabcc707803cdc1629af1781afa909533 -SHA256 (sloped-stations.patch) = 9e4f157b1fc3f93bdc743177d7d4b5a8a3e250a6582e30217fd17fcc162efc41 -SHA256 (underground.patch) = 8edad02641ea0dadb7b013a4602db4810d97ebcb5852d8f730ca96076f2596ec -SHA256 (5bd2b15e86.tar.gz) = a94b3cca29ae043af04876935b2368f43595c49d87a62d1e61c6e3591e4cc9d4 +SHA256 (signaltunnel.patch) = 1bc2ce005da8e1a33ca63606872d22da293aceef5995ade29017cc391c52faa1 +SHA256 (sloped-stations.patch) = ef0f0841e53b4da5434f500cebf217351c9569d5a6ce7c704c6beac0cabc2a80 +SHA256 (underground.patch) = b1389d8b9edeaa49219abfb081d08273d3487dcdb8cc2f37864b08feff8394bb +SHA256 (4f052fc2a4.tar.gz) = 269d05bd913e53759d889339d7763caed36a36e3fface02cf15be5e59af566af diff --git a/manualPorts/openttd-git/Pkgfile b/manualPorts/openttd-git/Pkgfile index 033182b..f53c6a1 100644 --- a/manualPorts/openttd-git/Pkgfile +++ b/manualPorts/openttd-git/Pkgfile @@ -5,7 +5,7 @@ # Depends on: libsdl libpng fontconfig lzo name=openttd-git -version=28845.5bd2b15e86 +version=28854.4f052fc2a4 gfxversion=0.5.4 sfxversion=0.2.3 diff --git a/manualPorts/openttd-git/signaltunnel.patch b/manualPorts/openttd-git/signaltunnel.patch index fa2561f..e9c8c33 100644 --- a/manualPorts/openttd-git/signaltunnel.patch +++ b/manualPorts/openttd-git/signaltunnel.patch @@ -366,7 +366,7 @@ index 8952000a51..137e435fb3 100644 case MP_RAILWAY: diff --git a/src/table/settings.ini b/src/table/settings.ini -index 78ed234ce2..92fb11e426 100644 +index 1aacb76349..834a61d122 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -541,6 +541,20 @@ str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH diff --git a/manualPorts/openttd-git/sloped-stations.patch b/manualPorts/openttd-git/sloped-stations.patch index efd536a..1f47de9 100644 --- a/manualPorts/openttd-git/sloped-stations.patch +++ b/manualPorts/openttd-git/sloped-stations.patch @@ -107,7 +107,7 @@ index 7086d151d0..3252327972 100644 } } diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp -index acffe113dd..675385d777 100644 +index 4aa6401279..7230ee2198 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -55,6 +55,7 @@ @@ -118,7 +118,7 @@ index acffe113dd..675385d777 100644 #include "table/strings.h" -@@ -800,7 +801,7 @@ CommandCost ClearTile_Station(TileIndex tile, DoCommandFlag flags); +@@ -764,7 +765,7 @@ CommandCost ClearTile_Station(TileIndex tile, DoCommandFlag flags); * Checks if the given tile is buildable, flat and has a certain height. * @param tile TileIndex to check. * @param invalid_dirs Prohibited directions for slopes (set of #DiagDirection). @@ -127,7 +127,7 @@ index acffe113dd..675385d777 100644 * @param allow_steep Whether steep slopes are allowed. * @param check_bridge Check for the existence of a bridge. * @return The cost in case of success, or an error code if it failed. -@@ -839,10 +840,10 @@ CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z +@@ -803,10 +804,10 @@ CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z } /* The level of this tile must be equal to allowed_z. */ @@ -140,7 +140,7 @@ index acffe113dd..675385d777 100644 return_cmd_error(STR_ERROR_FLAT_LAND_REQUIRED); } -@@ -890,14 +891,14 @@ static CommandCost CheckFlatLandAirport(AirportTileTableIterator tile_iter, DoCo +@@ -854,14 +855,14 @@ static CommandCost CheckFlatLandAirport(AirportTileTableIterator tile_iter, DoCo static CommandCost CheckFlatLandRailStation(TileArea tile_area, DoCommandFlag flags, Axis axis, StationID *station, RailType rt, std::vector &affected_vehicles, StationClassID spec_class, byte spec_index, byte plat_len, byte numtracks) { CommandCost cost(EXPENSES_CONSTRUCTION); @@ -157,7 +157,7 @@ index acffe113dd..675385d777 100644 if (ret.Failed()) return ret; cost.AddCost(ret); -@@ -976,10 +977,10 @@ static CommandCost CheckFlatLandRailStation(TileArea tile_area, DoCommandFlag fl +@@ -940,10 +941,10 @@ static CommandCost CheckFlatLandRailStation(TileArea tile_area, DoCommandFlag fl static CommandCost CheckFlatLandRoadStop(TileArea tile_area, DoCommandFlag flags, uint invalid_dirs, bool is_drive_through, bool is_truck_stop, Axis axis, StationID *station, RoadTypes rts) { CommandCost cost(EXPENSES_CONSTRUCTION); @@ -170,7 +170,7 @@ index acffe113dd..675385d777 100644 if (ret.Failed()) return ret; cost.AddCost(ret); -@@ -1874,7 +1875,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin +@@ -1838,7 +1839,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin /* Total road stop cost. */ CommandCost cost(EXPENSES_CONSTRUCTION, roadstop_area.w * roadstop_area.h * _price[type ? PR_BUILD_STATION_TRUCK : PR_BUILD_STATION_BUS]); StationID est = INVALID_STATION; @@ -179,7 +179,7 @@ index acffe113dd..675385d777 100644 if (ret.Failed()) return ret; cost.AddCost(ret); -@@ -2821,6 +2822,32 @@ static void DrawTile_Station(TileInfo *ti) +@@ -2785,6 +2786,32 @@ static void DrawTile_Station(TileInfo *ti) palette = PALETTE_TO_GREY; } @@ -212,7 +212,7 @@ index acffe113dd..675385d777 100644 if (layout == nullptr && (t == nullptr || t->seq == nullptr)) t = GetStationTileLayout(GetStationType(ti->tile), gfx); /* don't show foundation for docks */ -@@ -2887,10 +2914,10 @@ static void DrawTile_Station(TileInfo *ti) +@@ -2851,10 +2878,10 @@ static void DrawTile_Station(TileInfo *ti) } OffsetGroundSprite(31, 1); @@ -225,7 +225,7 @@ index acffe113dd..675385d777 100644 } } -@@ -2946,14 +2973,64 @@ draw_default_foundation: +@@ -2910,14 +2937,64 @@ draw_default_foundation: DrawGroundSprite(overlay + overlay_offset, PALETTE_CRASH); } } else { @@ -293,7 +293,7 @@ index acffe113dd..675385d777 100644 } } } -@@ -3006,6 +3083,16 @@ void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, Ro +@@ -2970,6 +3047,16 @@ void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, Ro static int GetSlopePixelZ_Station(TileIndex tile, uint x, uint y) { diff --git a/manualPorts/openttd-git/underground.patch b/manualPorts/openttd-git/underground.patch index fc38107..bb3c71d 100644 --- a/manualPorts/openttd-git/underground.patch +++ b/manualPorts/openttd-git/underground.patch @@ -366,7 +366,7 @@ index 4609dceeb9..86ee14cc56 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 df9286308e..48b2f4dc10 100644 +index 9978145fac..fbee8dcc65 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -14,6 +14,7 @@ @@ -377,7 +377,7 @@ index df9286308e..48b2f4dc10 100644 #include "viewport_func.h" #include "command_func.h" #include "town.h" -@@ -1400,7 +1401,7 @@ static CommandCost CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTil +@@ -1399,7 +1400,7 @@ static CommandCost CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTil IndustryGfx gfx = GetTranslatedIndustryTileID(it->gfx); TileIndex cur_tile = TileAddWrap(tile, it->ti.x, it->ti.y); @@ -1937,7 +1937,7 @@ index e9edbf2549..b3270e7004 100644 } diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp -index 18c1351176..f72855041f 100644 +index 17a793a09f..f9d15cc137 100644 --- a/src/saveload/map_sl.cpp +++ b/src/saveload/map_sl.cpp @@ -11,6 +11,7 @@ @@ -2031,7 +2031,7 @@ index 2459058979..923861f8c6 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 b211c6422e..a3560f2fd4 100644 +index 85603a38c8..903528a767 100644 --- a/src/station.cpp +++ b/src/station.cpp @@ -13,6 +13,7 @@ @@ -2127,7 +2127,7 @@ index b211c6422e..a3560f2fd4 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 acffe113dd..566bd84fb2 100644 +index 4aa6401279..510bc30724 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -13,6 +13,7 @@ @@ -2138,16 +2138,14 @@ index acffe113dd..566bd84fb2 100644 #include "viewport_func.h" #include "viewport_kdtree.h" #include "command_func.h" -@@ -99,23 +100,26 @@ bool IsHangar(TileIndex t) +@@ -99,21 +100,24 @@ bool IsHangar(TileIndex t) * @return Succeeded command (if zero or one station found) or failed command (for two or more stations found). */ template -CommandCost GetStationAround(TileArea ta, StationID closest_station, CompanyID company, T **st) +CommandCost GetStationAround(TileArea ta, StationID closest_station, CompanyID company, T **st, bool layers=false) { - ta.tile -= TileDiffXY(1, 1); - ta.w += 2; - ta.h += 2; + ta.Expand(1); /* check around to see if there are any stations there owned by the company */ - TILE_AREA_LOOP(tile_cur, ta) { @@ -2174,7 +2172,7 @@ index acffe113dd..566bd84fb2 100644 } *st = (closest_station == INVALID_STATION) ? nullptr : T::Get(closest_station); return CommandCost(); -@@ -835,7 +839,7 @@ CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z +@@ -799,7 +803,7 @@ CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z return_cmd_error(STR_ERROR_FLAT_LAND_REQUIRED); } } @@ -2183,7 +2181,7 @@ index acffe113dd..566bd84fb2 100644 } /* The level of this tile must be equal to allowed_z. */ -@@ -1064,7 +1068,7 @@ static CommandCost CheckFlatLandRoadStop(TileArea tile_area, DoCommandFlag flags +@@ -1028,7 +1032,7 @@ static CommandCost CheckFlatLandRoadStop(TileArea tile_area, DoCommandFlag flags } uint roadbits_to_build = CountBits(rts) * 2 - num_roadbits; @@ -2192,7 +2190,7 @@ index acffe113dd..566bd84fb2 100644 } } -@@ -1083,11 +1087,13 @@ CommandCost CanExpandRailStation(const BaseStation *st, TileArea &new_ta, Axis a +@@ -1047,11 +1051,13 @@ CommandCost CanExpandRailStation(const BaseStation *st, TileArea &new_ta, Axis a TileArea cur_ta = st->train_station; /* determine new size of train station region.. */ @@ -2211,7 +2209,7 @@ index acffe113dd..566bd84fb2 100644 /* make sure the final size is not too big. */ if (new_ta.w > _settings_game.station.station_spread || new_ta.h > _settings_game.station.station_spread) { -@@ -1159,7 +1165,7 @@ void GetStationLayout(byte *layout, int numtracks, int plat_len, const StationSp +@@ -1123,7 +1129,7 @@ void GetStationLayout(byte *layout, int numtracks, int plat_len, const StationSp * @return command cost with the error or 'okay' */ template @@ -2220,7 +2218,7 @@ index acffe113dd..566bd84fb2 100644 { assert(*st == nullptr); bool check_surrounding = true; -@@ -1185,7 +1191,7 @@ CommandCost FindJoiningBaseStation(StationID existing_station, StationID station +@@ -1149,7 +1155,7 @@ CommandCost FindJoiningBaseStation(StationID existing_station, StationID station if (check_surrounding) { /* Make sure there is no more than one other station around us that is owned by us. */ @@ -2229,7 +2227,7 @@ index acffe113dd..566bd84fb2 100644 if (ret.Failed()) return ret; } -@@ -1204,9 +1210,9 @@ CommandCost FindJoiningBaseStation(StationID existing_station, StationID station +@@ -1168,9 +1174,9 @@ CommandCost FindJoiningBaseStation(StationID existing_station, StationID station * @param st 'return' pointer for the found station * @return command cost with the error or 'okay' */ @@ -2241,7 +2239,7 @@ index acffe113dd..566bd84fb2 100644 } /** -@@ -1315,8 +1321,8 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32 +@@ -1279,8 +1285,8 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32 CommandCost cost = CheckFlatLandRailStation(new_location, flags, axis, &est, rt, affected_vehicles, spec_class, spec_index, plat_len, numtracks); if (cost.Failed()) return cost; /* Add construction expenses. */ @@ -2252,7 +2250,7 @@ index acffe113dd..566bd84fb2 100644 Station *st = nullptr; ret = FindJoiningStation(est, station_to_join, adjacent, new_location, &st); -@@ -1356,8 +1362,10 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32 +@@ -1320,8 +1326,10 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32 byte numtracks_orig; Track track; @@ -2264,7 +2262,7 @@ index acffe113dd..566bd84fb2 100644 st->rect.BeforeAddRect(tile_org, w_org, h_org, StationRect::ADD_TRY); -@@ -1578,7 +1586,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, std::vector &affected_st +@@ -1542,7 +1550,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, std::vector &affected_st } /* If we reached here, the tile is valid so increase the quantity of tiles we will remove */ @@ -2273,7 +2271,7 @@ index acffe113dd..566bd84fb2 100644 if (keep_rail || IsStationTileBlocked(tile)) { /* Don't refund the 'steel' of the track when we keep the -@@ -1657,7 +1665,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, std::vector &affected_st +@@ -1621,7 +1629,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, std::vector &affected_st CommandCost CmdRemoveFromRailStation(TileIndex start, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { TileIndex end = p1 == 0 ? start : p1; @@ -2282,7 +2280,7 @@ index acffe113dd..566bd84fb2 100644 TileArea ta(start, end); std::vector affected_stations; -@@ -1720,11 +1728,16 @@ CommandCost RemoveRailStation(T *st, DoCommandFlag flags, Money removal_cost) +@@ -1684,11 +1692,16 @@ CommandCost RemoveRailStation(T *st, DoCommandFlag flags, Money removal_cost) /* determine width and height of platforms */ TileArea ta = st->train_station; @@ -2301,7 +2299,7 @@ index acffe113dd..566bd84fb2 100644 /* only remove tiles that are actually train station tiles */ if (st->TileBelongsToRailStation(tile)) { std::vector affected_stations; // dummy -@@ -2089,13 +2102,21 @@ CommandCost CmdRemoveRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, ui +@@ -2053,13 +2066,21 @@ CommandCost CmdRemoveRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, ui /* Bankrupting company is not supposed to remove roads, there may be road vehicles. */ if (!keep_drive_through_roads && (flags & DC_BANKRUPT)) return CMD_ERROR; @@ -2325,7 +2323,7 @@ index acffe113dd..566bd84fb2 100644 /* Make sure the specified tile is a road stop of the correct type */ if (!IsTileType(cur_tile, MP_STATION) || !IsRoadStop(cur_tile) || (uint32)GetRoadStopType(cur_tile) != GB(p2, 0, 1)) continue; -@@ -2279,6 +2300,10 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint +@@ -2243,6 +2264,10 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint if (w > _settings_game.station.station_spread || h > _settings_game.station.station_spread) { return_cmd_error(STR_ERROR_STATION_TOO_SPREAD_OUT); } @@ -2337,7 +2335,7 @@ index acffe113dd..566bd84fb2 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 a3013c847f..6c8a6e6253 100644 +index 4e6b94caf6..9d4046fa57 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -21,6 +21,7 @@ @@ -2397,7 +2395,7 @@ index a3013c847f..6c8a6e6253 100644 return nullptr; } diff --git a/src/table/settings.ini b/src/table/settings.ini -index 78ed234ce2..745b62ba76 100644 +index 1aacb76349..726036977a 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -1861,6 +1861,15 @@ min = 500 @@ -2537,7 +2535,7 @@ index 0cb28122d8..c6f62dac0f 100644 } diff --git a/src/tilearea_type.h b/src/tilearea_type.h -index 45bfb3d4c0..164781814b 100644 +index c599753498..869ff3e09a 100644 --- a/src/tilearea_type.h +++ b/src/tilearea_type.h @@ -44,6 +44,16 @@ struct OrthogonalTileArea { -- cgit v1.2.3-70-g09d2