mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Merge pull request #16230 from IntelOrca/fix/16204-no-station

Browse Source 
Fix  #16204: Invisible entrance/exits render as tiny land sprites
This commit is contained in:
Michael Steenbeek
2021-12-13 23:37:55 +01:00
committed by GitHub
parent cb6d7418c5 04dac023cb
commit 751149abe8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/Ride.cpp
View File

@@ -4878,7 +4878,7 @@ static void WindowRideColourPaint(rct_window* w, rct_drawpixelinfo* dpi)
gfx_clear(&clippedDpi, PALETTE_INDEX_12);
auto stationObj = ride_get_station_object(ride);
if (stationObj != nullptr && stationObj->BaseImageId != 0)
if (stationObj != nullptr && stationObj->BaseImageId != ImageIndexUndefined)
{
auto imageTemplate = ImageId(trackColour.main, trackColour.additional);
auto imageId = imageTemplate.WithIndex(stationObj->BaseImageId);

2
src/openrct2/paint/tile_element/Paint.Entrance.cpp
View File

@@ -118,7 +118,7 @@ static void PaintRideEntranceExit(paint_session* session, uint8_t direction, int
}
auto stationObj = ride_get_station_object(ride);
if (stationObj == nullptr || stationObj->BaseImageId == 0)
if (stationObj == nullptr || stationObj->BaseImageId == ImageIndexUndefined)
{
return;
}

2
src/openrct2/paint/tile_element/Paint.Surface.cpp
View File

@@ -1068,7 +1068,7 @@ void PaintSurface(paint_session* session, uint8_t direction, uint16_t height, co
}
if (session->ViewFlags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE))
{
imageId = imageId.WithRemap(FilterPaletteID::PaletteDarken1).WithBlended(true);
imageId = imageId.WithTransparancy(FilterPaletteID::PaletteDarken1);
}
if (OpenRCT2::TileInspector::IsElementSelected(elementPtr))