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

Make all access to RTD table use the bounds checking function

Browse Source
This commit is contained in:
Gymnasiast
2021-02-26 10:01:00 +01:00
parent 62f8796677
commit 44d0e77afb
31 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@@ -1318,7 +1318,7 @@ static void editor_load_selected_objects()
{
rct_ride_entry* rideEntry = get_ride_entry(entryIndex);
uint8_t rideType = ride_entry_get_first_non_null_ride_type(rideEntry);
ResearchCategory category = static_cast<ResearchCategory>(RideTypeDescriptors[rideType].Category);
ResearchCategory category = static_cast<ResearchCategory>(GetRideTypeDescriptor(rideType).Category);
research_insert_ride_entry(rideType, entryIndex, category, true);
}
else if (objectType == ObjectType::SceneryGroup)
@@ -1485,7 +1485,7 @@ static bool filter_chunks(const ObjectRepositoryItem* item)
break;
}
}
return (_filter_flags & (1 << (RideTypeDescriptors[rideType].Category + _numSourceGameItems))) != 0;
return (_filter_flags & (1 << (GetRideTypeDescriptor(rideType).Category + _numSourceGameItems))) != 0;
}
return true;
}
@@ -1519,7 +1519,7 @@ static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem* item)
uint8_t rideType = item->RideInfo.RideType[i];
if (rideType != RIDE_TYPE_NULL)
{
result = RideTypeDescriptors[rideType].Naming.Name;
result = GetRideTypeDescriptor(rideType).Naming.Name;
break;
}
}