mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 08:12:53 +01:00
Code Issues Releases Wiki Activity

Refactor checks for ghost tracks while painting

Browse Source
This commit is contained in:
Gymnasiast
2022-12-24 15:18:14 +01:00
parent 057205d153
commit b712cc8f07
14 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2/paint/Paint.h
View File

@@ -288,6 +288,7 @@ extern CoordsXY gClipSelectionB;
/** rct2: 0x00993CC4. The white ghost that indicates not-yet-built elements. */
constexpr const ImageId ConstructionMarker = ImageId(0).WithRemap(FilterPaletteID::Palette44);
constexpr const ImageId HighlightMarker = ImageId(0).WithRemap(FilterPaletteID::Palette44);
constexpr const ImageId TrackGhost = ImageId(0, FilterPaletteID::PaletteNull);
extern bool gShowDirtyVisuals;
extern bool gPaintBoundingBoxes;

3
src/openrct2/ride/TrackPaint.cpp
View File

@@ -822,8 +822,7 @@ bool track_paint_util_draw_station_covers_2(
PaintAddImageAsParent(session, imageId, offset, boundBox);
// Glass
if (session.TrackColours[SCHEME_MISC].ToUInt32() == IMAGE_TYPE_REMAP
&& (stationObject->Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT))
if (session.TrackColours[SCHEME_MISC] == TrackGhost && (stationObject->Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT))
{
imageId = ImageId(baseImageIndex + imageOffset + 12).WithTransparency(imageTemplate.GetPrimary());
PaintAddImageAsChild(session, imageId, offset, boundBox);

2
src/openrct2/ride/gentle/Circus.cpp
View File

@@ -32,7 +32,7 @@ static void PaintCircusTent(PaintSession& session, const Ride& ride, uint8_t dir
auto imageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto imageFlags = session.TrackColours[SCHEME_MISC];
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
imageTemplate = imageFlags;
}

2
src/openrct2/ride/gentle/FerrisWheel.cpp
View File

@@ -79,7 +79,7 @@ static void PaintFerrisWheelStructure(
auto supportsImageTemplate = session.TrackColours[SCHEME_TRACK];
auto wheelImageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto wheelImageFlags = session.TrackColours[SCHEME_MISC];
if (wheelImageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (wheelImageFlags != TrackGhost)
{
wheelImageTemplate = wheelImageFlags;
}

2
src/openrct2/ride/gentle/MerryGoRound.cpp
View File

@@ -84,7 +84,7 @@ static void PaintCarousel(
auto imageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto imageFlags = session.TrackColours[SCHEME_MISC];
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
imageTemplate = imageFlags;
}

2
src/openrct2/ride/gentle/SpaceRings.cpp
View File

@@ -59,7 +59,7 @@ static void PaintSpaceRingsStructure(
vehicleIndex = 0;
}
if (imageColourFlags.ToUInt32() == IMAGE_TYPE_REMAP)
if (imageColourFlags == TrackGhost)
{
imageColourFlags = ImageId(0, ride.vehicle_colours[vehicleIndex].Body, ride.vehicle_colours[vehicleIndex].Trim);
}

2
src/openrct2/ride/thrill/3dCinema.cpp
View File

@@ -32,7 +32,7 @@ static void Paint3dCinemaDome(
auto imageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto imageFlags = session.TrackColours[SCHEME_MISC];
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
imageTemplate = imageFlags;
}

2
src/openrct2/ride/thrill/Enterprise.cpp
View File

@@ -71,7 +71,7 @@ static void PaintEnterpriseStructure(
auto imageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto imageFlags = session.TrackColours[SCHEME_MISC];
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
imageTemplate = imageFlags;
}

2
src/openrct2/ride/thrill/MagicCarpet.cpp
View File

@@ -166,7 +166,7 @@ static void PaintMagicCarpetVehicle(
// Vehicle
auto imageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto imageFlags = session.TrackColours[SCHEME_MISC];
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
imageTemplate = imageFlags;
}

2
src/openrct2/ride/thrill/MotionSimulator.cpp
View File

@@ -66,7 +66,7 @@ static void PaintMotionSimulatorVehicle(
auto imageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto imageFlags = session.TrackColours[SCHEME_MISC];
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
imageTemplate = imageFlags;
}

2
src/openrct2/ride/thrill/SwingingInverterShip.cpp
View File

@@ -101,7 +101,7 @@ static void PaintSwingingInverterShipStructure(
auto vehicleImageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto imageFlags = session.TrackColours[SCHEME_MISC];
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
vehicleImageTemplate = imageFlags;
}

2
src/openrct2/ride/thrill/SwingingShip.cpp
View File

@@ -124,7 +124,7 @@ static void PaintSwingingShipStructure(
auto supportsImageTemplate = session.TrackColours[SCHEME_TRACK];
auto vehicleImageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
auto imageFlags = session.TrackColours[SCHEME_MISC];
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
vehicleImageTemplate = imageFlags;
}

4
src/openrct2/ride/thrill/TopSpin.cpp
View File

@@ -103,7 +103,7 @@ static void PaintTopSpinSeat(
auto imageFlags = session.TrackColours[SCHEME_MISC];
auto imageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
imageTemplate = imageFlags;
}
@@ -152,7 +152,7 @@ static void PaintTopSpinVehicle(
auto imageFlags = session.TrackColours[SCHEME_MISC];
auto supportImageTemplate = ImageId(0, ride.track_colour[0].main, ride.track_colour[0].supports);
auto armImageTemplate = ImageId(0, ride.track_colour[0].main, ride.track_colour[0].additional);
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
supportImageTemplate = imageFlags;
armImageTemplate = supportImageTemplate;

2
src/openrct2/ride/thrill/Twist.cpp
View File

@@ -51,7 +51,7 @@ static void paint_twist_structure(
auto imageFlags = session.TrackColours[SCHEME_MISC];
auto imageTemplate = ImageId(0, ride.vehicle_colours[0].Body, ride.vehicle_colours[0].Trim);
if (imageFlags.ToUInt32() != IMAGE_TYPE_REMAP)
if (imageFlags != TrackGhost)
{
imageTemplate = imageFlags;
}