From 394e8fb733e832b3afb34a8d82e3ad2f3bf1380e Mon Sep 17 00:00:00 2001 From: Cory Sanin Date: Sat, 1 Aug 2020 17:28:47 -0500 Subject: [PATCH] Resolve GCC warnings for Ride.cpp (#12553) Eliminate warnings from ride_create_vehicles and ride_create_vehicles_find_first_block that would prevent build from succeeding when using GCC. --- src/openrct2/ride/Ride.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 78b3671501..7eb1ebb465 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -4629,7 +4629,8 @@ static void vehicle_unset_update_flag_b1(Vehicle* head) static void ride_create_vehicles_find_first_block(Ride* ride, CoordsXYE* outXYElement) { Vehicle* vehicle = GetEntity(ride->vehicles[0]); - assert(vehicle != nullptr); + if (vehicle == nullptr) + return; auto curTrackPos = vehicle->TrackLocation; auto curTrackElement = map_get_track_element_at(curTrackPos); @@ -4744,7 +4745,7 @@ static bool ride_create_vehicles(Ride* ride, const CoordsXYE& element, int32_t i { if (ride->IsBlockSectioned()) { - CoordsXYE firstBlock; + CoordsXYE firstBlock{}; ride_create_vehicles_find_first_block(ride, &firstBlock); loc_6DDF9C(ride, firstBlock.element); }