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

Remove unused flags members from TrackDesign

Browse Source
This commit is contained in:
Gymnasiast
2024-06-11 23:12:24 +02:00
parent cdbedeece6
commit 267c2e5ecc
5 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/rct1/T4Importer.cpp
View File

@@ -94,8 +94,6 @@ namespace RCT1
td->trackSupportColour[i] = RCT1::GetColour(td4aa.TrackSupportColour[i]);
}
td->flags2 = td4aa.Flags2;
return ImportTD4Base(std::move(td), td4aa);
}
@@ -121,7 +119,7 @@ namespace RCT1
td->trackRailColour[i] = COLOUR_WHITE;
}
}
td->flags2 = 0;
return ImportTD4Base(std::move(td), td4);
}
@@ -149,7 +147,6 @@ namespace RCT1
td->vehicleObject = ObjectEntryDescriptor(vehicleObject);
td->vehicleType = EnumValue(td4Base.VehicleType);
td->flags = td4Base.Flags;
td->colourScheme = td4Base.VersionAndColourScheme & 0x3;
// Vehicle colours

4
src/openrct2/rct2/T6Exporter.cpp
View File

@@ -54,7 +54,7 @@ namespace RCT2
OpenRCT2::MemoryStream tempStream;
tempStream.WriteValue<uint8_t>(OpenRCT2RideTypeToRCT2RideType(_trackDesign->type));
tempStream.WriteValue<uint8_t>(_trackDesign->vehicleType);
tempStream.WriteValue<uint32_t>(_trackDesign->flags);
tempStream.WriteValue<uint32_t>(0);
tempStream.WriteValue<uint8_t>(static_cast<uint8_t>(_trackDesign->rideMode));
tempStream.WriteValue<uint8_t>((_trackDesign->colourScheme & 0x3) | (2 << 2));
for (auto i = 0; i < RCT2::Limits::kMaxVehicleColours; i++)
@@ -89,7 +89,7 @@ namespace RCT2
tempStream.WriteArray(_trackDesign->trackSpineColour, Limits::kNumColourSchemes);
tempStream.WriteArray(_trackDesign->trackRailColour, Limits::kNumColourSchemes);
tempStream.WriteArray(_trackDesign->trackSupportColour, Limits::kNumColourSchemes);
tempStream.WriteValue<uint32_t>(_trackDesign->flags2);
tempStream.WriteValue<uint32_t>(0);
tempStream.Write(&_trackDesign->vehicleObject.Entry, sizeof(RCTObjectEntry));
tempStream.WriteValue<uint8_t>(_trackDesign->spaceRequiredX);
tempStream.WriteValue<uint8_t>(_trackDesign->spaceRequiredY);

2
src/openrct2/rct2/T6Importer.cpp
View File

@@ -75,7 +75,6 @@ namespace RCT2
td->vehicleType = td6.VehicleType;
td->cost = 0.00_GBP;
td->flags = td6.Flags;
td->rideMode = static_cast<RideMode>(td6.RideMode);
td->trackFlags = 0;
td->colourScheme = td6.VersionAndColourScheme & 0x3;
@@ -121,7 +120,6 @@ namespace RCT2
td->trackRailColour[i] = td6.TrackRailColour[i];
td->trackSupportColour[i] = td6.TrackSupportColour[i];
}
td->flags2 = td6.Flags2;
td->vehicleObject = ObjectEntryDescriptor(td6.VehicleObject);
td->spaceRequiredX = td6.SpaceRequiredX;
td->spaceRequiredY = td6.SpaceRequiredY;

4
src/openrct2/ride/TrackDesign.cpp
View File

@@ -158,8 +158,6 @@ ResultWithMessage TrackDesign::CreateTrackDesign(TrackDesignState& tds, const Ri
nausea = ride.ratings.Nausea / 10;
upkeepCost = ride.upkeep_cost;
flags = 0;
flags2 = 0;
const auto& rtd = GetRideTypeDescriptor(type);
@@ -566,7 +564,6 @@ void TrackDesign::Serialise(DataSerialiser& stream)
stream << DS_TAG(type);
stream << DS_TAG(vehicleType);
stream << DS_TAG(cost);
stream << DS_TAG(flags);
stream << DS_TAG(rideMode);
stream << DS_TAG(trackFlags);
stream << DS_TAG(colourScheme);
@@ -596,7 +593,6 @@ void TrackDesign::Serialise(DataSerialiser& stream)
stream << DS_TAG(trackSpineColour);
stream << DS_TAG(trackRailColour);
stream << DS_TAG(trackSupportColour);
stream << DS_TAG(flags2);
stream << DS_TAG(vehicleObject);
stream << DS_TAG(spaceRequiredX);
stream << DS_TAG(spaceRequiredY);

2
src/openrct2/ride/TrackDesign.h
View File

@@ -121,7 +121,6 @@ struct TrackDesign
uint8_t type;
uint8_t vehicleType;
money64 cost;
uint32_t flags;
RideMode rideMode;
uint8_t trackFlags;
uint8_t colourScheme;
@@ -151,7 +150,6 @@ struct TrackDesign
uint8_t trackSpineColour[OpenRCT2::Limits::kNumColourSchemes];
uint8_t trackRailColour[OpenRCT2::Limits::kNumColourSchemes];
uint8_t trackSupportColour[OpenRCT2::Limits::kNumColourSchemes];
uint32_t flags2;
ObjectEntryDescriptor vehicleObject;
uint8_t spaceRequiredX;
uint8_t spaceRequiredY;