From 4b9c70409674b27a714f192e7b5fe2c2705c9dc9 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 7 Mar 2021 12:53:38 +0000 Subject: [PATCH] Log warning instead of assert in research_finish_item --- src/openrct2/management/Research.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index d041ec72da..586ed4047a 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -200,11 +200,11 @@ void research_finish_item(ResearchItem* researchItem) if (rideEntry != nullptr && base_ride_type != RIDE_TYPE_NULL) { + if (base_ride_type >= RIDE_TYPE_COUNT) + log_warning("Invalid ride type: %d", base_ride_type); + rct_string_id availabilityString; - ride_type_set_invented(base_ride_type); - openrct2_assert(base_ride_type < RIDE_TYPE_COUNT, "Invalid base_ride_type = %d", base_ride_type); - ride_entry_set_invented(rideEntryIndex); bool seenRideEntry[MAX_RIDE_OBJECTS]{}; @@ -539,8 +539,10 @@ bool ride_entry_is_invented(int32_t rideEntryIndex) void ride_type_set_invented(uint32_t rideType) { - Guard::Assert(rideType < std::size(_researchedRideTypes), GUARD_LINE); - _researchedRideTypes[rideType] = true; + if (rideType < std::size(_researchedRideTypes)) + { + _researchedRideTypes[rideType] = true; + } } void ride_entry_set_invented(int32_t rideEntryIndex)