diff options
| author | Erich Eckner <git@eckner.net> | 2021-05-15 00:03:05 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2021-05-15 00:03:44 +0200 |
| commit | 846512d3839112cf03711057a71d8bc2204b8701 (patch) | |
| tree | b1681819010db0b711240570ba8eb05a5316cbe9 /manualPorts/openttd-git/sloped-stations.patch | |
| parent | 0cdfee78636a0ed8ebeb9c1bad7ef8c0af4cfb13 (diff) | |
| download | crux-ports-846512d3839112cf03711057a71d8bc2204b8701.tar.xz | |
openttd-git: 30669.d0eb3e4bc-1 -> 30707.1da0ba95b-1
Diffstat (limited to 'manualPorts/openttd-git/sloped-stations.patch')
| -rw-r--r-- | manualPorts/openttd-git/sloped-stations.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/manualPorts/openttd-git/sloped-stations.patch b/manualPorts/openttd-git/sloped-stations.patch index 6f266a9..4c21d15 100644 --- a/manualPorts/openttd-git/sloped-stations.patch +++ b/manualPorts/openttd-git/sloped-stations.patch @@ -18,7 +18,7 @@ index 888b98e94..f7fece1d2 100644 * --------- * |\ /| diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp -index 830f9dd4f..44a6c6020 100644 +index 82e944f6e..a1fd34e4a 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -37,6 +37,7 @@ @@ -94,7 +94,7 @@ index 969b141ba..1af4275eb 100644 + #endif /* ROAD_TYPE_H */ diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp -index 1a4e4e085..38e2bd925 100644 +index d44a37c87..84ef73661 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -1505,7 +1505,7 @@ again: @@ -107,7 +107,7 @@ index 1a4e4e085..38e2bd925 100644 } } diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp -index 7266ad618..b2e807fba 100644 +index eecb08d7c..78cb2d3da 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -56,6 +56,7 @@ @@ -151,7 +151,7 @@ index 7266ad618..b2e807fba 100644 const StationSpec *statspec = StationClass::Get(spec_class)->GetSpec(spec_index); bool slope_cb = statspec != nullptr && HasBit(statspec->callback_mask, CBM_STATION_SLOPE_CHECK); - TILE_AREA_LOOP(tile_cur, tile_area) { + for (TileIndex tile_cur : tile_area) { - CommandCost ret = CheckBuildableTile(tile_cur, invalid_dirs, allowed_z, false); + CommandCost ret = CheckBuildableTile(tile_cur, 0, allowed_z, true); if (ret.Failed()) return ret; @@ -164,7 +164,7 @@ index 7266ad618..b2e807fba 100644 - int allowed_z = -1; + int allowed_z = -2; - TILE_AREA_LOOP(cur_tile, tile_area) { + for (TileIndex cur_tile : tile_area) { - CommandCost ret = CheckBuildableTile(cur_tile, invalid_dirs, allowed_z, !is_drive_through); + CommandCost ret = CheckBuildableTile(cur_tile, invalid_dirs, allowed_z, true); if (ret.Failed()) return ret; @@ -179,7 +179,7 @@ index 7266ad618..b2e807fba 100644 if (ret.Failed()) return ret; cost.AddCost(ret); -@@ -2899,6 +2900,32 @@ static void DrawTile_Station(TileInfo *ti) +@@ -2898,6 +2899,32 @@ static void DrawTile_Station(TileInfo *ti) palette = PALETTE_TO_GREY; } @@ -212,7 +212,7 @@ index 7266ad618..b2e807fba 100644 if (layout == nullptr && (t == nullptr || t->seq == nullptr)) t = GetStationTileLayout(GetStationType(ti->tile), gfx); /* don't show foundation for docks */ -@@ -2965,10 +2992,10 @@ static void DrawTile_Station(TileInfo *ti) +@@ -2964,10 +2991,10 @@ static void DrawTile_Station(TileInfo *ti) } OffsetGroundSprite(31, 1); @@ -225,7 +225,7 @@ index 7266ad618..b2e807fba 100644 } } -@@ -3024,14 +3051,64 @@ draw_default_foundation: +@@ -3023,14 +3050,64 @@ draw_default_foundation: DrawGroundSprite(overlay + overlay_offset, PALETTE_CRASH); } } else { @@ -293,7 +293,7 @@ index 7266ad618..b2e807fba 100644 } } } -@@ -3125,6 +3202,16 @@ void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, Ro +@@ -3124,6 +3201,16 @@ void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, Ro static int GetSlopePixelZ_Station(TileIndex tile, uint x, uint y) { @@ -343,7 +343,7 @@ index b7bb91020..732a2dae7 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 8429914f3..e2f8ef411 100644 +index 53a69e1e2..2b6deecd0 100644 --- a/src/table/station_land.h +++ b/src/table/station_land.h @@ -775,6 +775,62 @@ static const DrawTileSeqStruct _station_display_datas_waypoint_Y[] = { |