From 87dc006b8c005a85d1bde7767103500065297a0f Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 12 Mar 2021 21:26:22 +0000 Subject: [PATCH] Apply code review suggestions --- src/openrct2/management/Research.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 586ed4047a..7f370ae043 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -200,8 +200,11 @@ void research_finish_item(ResearchItem* researchItem) if (rideEntry != nullptr && base_ride_type != RIDE_TYPE_NULL) { - if (base_ride_type >= RIDE_TYPE_COUNT) + if (RideTypeIsValid(base_ride_type)) + { log_warning("Invalid ride type: %d", base_ride_type); + base_ride_type = ride_entry_get_first_non_null_ride_type(rideEntry); + } rct_string_id availabilityString; ride_type_set_invented(base_ride_type); @@ -528,8 +531,7 @@ bool research_insert_scenery_group_entry(ObjectEntryIndex entryIndex, bool resea bool ride_type_is_invented(uint32_t rideType) { - Guard::Assert(rideType < std::size(_researchedRideTypes), GUARD_LINE); - return _researchedRideTypes[rideType]; + return RideTypeIsValid(rideType) ? _researchedRideTypes[rideType] : false; } bool ride_entry_is_invented(int32_t rideEntryIndex) @@ -539,7 +541,7 @@ bool ride_entry_is_invented(int32_t rideEntryIndex) void ride_type_set_invented(uint32_t rideType) { - if (rideType < std::size(_researchedRideTypes)) + if (RideTypeIsValid(rideType)) { _researchedRideTypes[rideType] = true; }