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

Implement removing of trackless rides

Browse Source
This commit is contained in:
Ted John
2021-04-26 23:54:00 +01:00
parent dbd1f0aa46
commit c9b2e9fb55
4 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/openrct2/ParkFile.cpp
View File

@@ -93,6 +93,7 @@ namespace OpenRCT2
public:
ObjectList RequiredObjects;
std::vector<const ObjectRepositoryItem*> ExportObjectsList;
bool OmitTracklessRides{};
private:
std::unique_ptr<OrcaStream> _os;
@@ -839,7 +840,7 @@ namespace OpenRCT2
void ReadWriteRidesChunk(OrcaStream& os)
{
os.ReadWriteChunk(ParkFileChunkType::RIDES, [](OrcaStream::ChunkStream& cs) {
os.ReadWriteChunk(ParkFileChunkType::RIDES, [this](OrcaStream::ChunkStream& cs) {
std::vector<ride_id_t> rideIds;
if (cs.GetMode() == OrcaStream::Mode::READING)
{
@@ -847,9 +848,24 @@ namespace OpenRCT2
}
else
{
for (const auto& ride : GetRideManager())
if (OmitTracklessRides)
{
rideIds.push_back(ride.id);
auto tracklessRides = GetTracklessRides();
for (const auto& ride : GetRideManager())
{
auto it = std::find(tracklessRides.begin(), tracklessRides.end(), ride.id);
if (it == tracklessRides.end())
{
rideIds.push_back(ride.id);
}
}
}
else
{
for (const auto& ride : GetRideManager())
{
rideIds.push_back(ride.id);
}
}
}
cs.ReadWriteVector(rideIds, [&cs](ride_id_t& rideId) {
@@ -1614,8 +1630,7 @@ int32_t scenario_save(const utf8* path, int32_t flags)
auto& objManager = OpenRCT2::GetContext()->GetObjectManager();
parkFile->ExportObjectsList = objManager.GetPackableObjects();
}
// s6exporter->RemoveTracklessRides = true;
// s6exporter->Export();
parkFile->OmitTracklessRides = true;
if (flags & S6_SAVE_FLAG_SCENARIO)
{
// s6exporter->SaveScenario(path);