mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Fix RCT1 import if research list is gone

Browse Source
This commit is contained in:
Gymnasiast
2018-11-17 17:59:15 +01:00
parent af91a0ef61
commit ace42a98a5
2 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/rct1/RCT1.h
View File

@@ -637,8 +637,8 @@ struct rct1_s4
uint8_t unk_198856;
uint8_t research_level;
uint32_t unk_198858;
uint8_t available_rides[32];
uint8_t available_vehicles[32];
uint32_t available_rides[8];
uint32_t available_vehicles[8];
uint32_t ride_feature_1[128];
uint32_t ride_feature_2[128];
uint16_t guests_in_park;

54
src/openrct2/rct1/S4Importer.cpp
View File

@@ -464,6 +464,32 @@ private:
}
}
}
// In addition to the research list, there is also a list of invented ride/vehicles in general.
// This is especially useful if the research list is damaged or if the save is hacked.
for (int32_t rideType = 0; rideType < RCT1_RIDE_TYPE_COUNT; rideType++)
{
int32_t quadIndex = rideType >> 5;
int32_t bitIndex = rideType & 0x1F;
bool invented = (_s4.available_rides[quadIndex] & ((uint32_t)1 << bitIndex));
if (invented)
{
AddEntryForRideType(rideType);
}
}
for (int32_t vehicleType = 0; vehicleType < RCT1_VEHICLE_TYPE_COUNT; vehicleType++)
{
int32_t quadIndex = vehicleType >> 5;
int32_t bitIndex = vehicleType & 0x1F;
bool invented = (_s4.available_vehicles[quadIndex] & ((uint32_t)1 << bitIndex));
if (invented)
{
AddEntryForVehicleType(RIDE_TYPE_NULL, vehicleType);
}
}
}
void AddAvailableEntriesFromMap()
@@ -602,7 +628,8 @@ private:
size_t entryIndex = _rideEntries.GetOrAddEntry(entryName);
_vehicleTypeToRideEntryMap[vehicleType] = (uint8_t)entryIndex;
_rideTypeToRideEntryMap[rideType] = (uint8_t)entryIndex;
if (rideType != RIDE_TYPE_NULL)
_rideTypeToRideEntryMap[rideType] = (uint8_t)entryIndex;
}
}
@@ -2284,6 +2311,31 @@ private:
}
}
// Also import the tables that register the invented status, in case the research list is damaged.
for (int32_t rideType = 0; rideType < RCT1_RIDE_TYPE_COUNT; rideType++)
{
int32_t quadIndex = rideType >> 5;
int32_t bitIndex = rideType & 0x1F;
bool invented = (_s4.available_rides[quadIndex] & ((uint32_t)1 << bitIndex));
if (invented)
{
ride_type_set_invented(RCT1::GetRideType(rideType));
}
}
for (int32_t vehicleType = 0; vehicleType < RCT1_VEHICLE_TYPE_COUNT; vehicleType++)
{
int32_t quadIndex = vehicleType >> 5;
int32_t bitIndex = vehicleType & 0x1F;
bool invented = (_s4.available_vehicles[quadIndex] & ((uint32_t)1 << bitIndex));
if (invented)
{
ride_entry_set_invented(_vehicleTypeToRideEntryMap[vehicleType]);
}
}
// Research funding / priority
uint8_t activeResearchTypes = 0;
if (_s4.research_priority & RCT1_RESEARCH_CATEGORY_ROLLERCOASTERS)