mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00
Code Issues Releases Wiki Activity

Fix crash in ride_scroll_to_track_error()

Browse Source
This commit is contained in:
Gymnasiast
2022-08-13 17:21:34 +02:00
parent ec81a5ff14
commit 4832e67d14
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/interface/ViewportInteraction.cpp
View File

@@ -565,7 +565,7 @@ bool ViewportInteractionRightClick(const ScreenCoordsXY& screenCoords)
break;
case ViewportInteractionItem::Ride:
tileElement = { info.Loc, info.Element };
ride_modify(&tileElement);
ride_modify(tileElement);
break;
case ViewportInteractionItem::Scenery:
ViewportInteractionRemoveScenery(info.Element, info.Loc);

33
src/openrct2/ride/Ride.cpp
View File

@@ -3818,7 +3818,7 @@ void Ride::ConstructMissingEntranceOrExit() const
CoordsXYE trackElement;
ride_try_get_origin_element(this, &trackElement);
ride_find_track_gap(this, &trackElement, &trackElement);
int32_t ok = ride_modify(&trackElement);
int32_t ok = ride_modify(trackElement);
if (ok == 0)
{
return;
@@ -3834,12 +3834,15 @@ void Ride::ConstructMissingEntranceOrExit() const
*
* rct2: 0x006B528A
*/
static void ride_scroll_to_track_error(CoordsXYE* trackElement)
static void ride_scroll_to_track_error(const CoordsXYE& trackElement)
{
if (trackElement.element == nullptr)
return;
auto* w = window_get_main();
if (w != nullptr)
{
window_scroll_to_location(*w, { *trackElement, trackElement->element->GetBaseZ() });
window_scroll_to_location(*w, { trackElement, trackElement.element->GetBaseZ() });
ride_modify(trackElement);
}
}
@@ -3922,7 +3925,7 @@ ResultWithMessage Ride::Test(RideStatus newStatus, bool isApplying)
if (ride_find_track_gap(this, &trackElement, &problematicTrackElement)
&& (newStatus != RideStatus::Simulating || IsBlockSectioned()))
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_TRACK_IS_NOT_A_COMPLETE_CIRCUIT };
}
}
@@ -3932,7 +3935,7 @@ ResultWithMessage Ride::Test(RideStatus newStatus, bool isApplying)
auto blockBrakeCheck = RideCheckBlockBrakes(trackElement, &problematicTrackElement);
if (!blockBrakeCheck.Successful)
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, blockBrakeCheck.Message };
}
}
@@ -3944,7 +3947,7 @@ ResultWithMessage Ride::Test(RideStatus newStatus, bool isApplying)
{
if (ride_check_track_contains_inversions(&trackElement, &problematicTrackElement))
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_TRACK_UNSUITABLE_FOR_TYPE_OF_TRAIN };
}
}
@@ -3952,7 +3955,7 @@ ResultWithMessage Ride::Test(RideStatus newStatus, bool isApplying)
{
if (ride_check_track_contains_banked(&trackElement, &problematicTrackElement))
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_TRACK_UNSUITABLE_FOR_TYPE_OF_TRAIN };
}
}
@@ -3967,13 +3970,13 @@ ResultWithMessage Ride::Test(RideStatus newStatus, bool isApplying)
if (!ride_check_station_length(&trackElement, &problematicTrackElement))
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_STATION_NOT_LONG_ENOUGH };
}
if (!ride_check_start_and_end_is_station(&trackElement))
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_RIDE_MUST_START_AND_END_WITH_STATIONS };
}
}
@@ -4057,7 +4060,7 @@ ResultWithMessage Ride::Open(bool isApplying)
{
if (ride_find_track_gap(this, &trackElement, &problematicTrackElement))
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_TRACK_IS_NOT_A_COMPLETE_CIRCUIT };
}
}
@@ -4067,7 +4070,7 @@ ResultWithMessage Ride::Open(bool isApplying)
auto blockBrakeCheck = RideCheckBlockBrakes(trackElement, &problematicTrackElement);
if (!blockBrakeCheck.Successful)
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, blockBrakeCheck.Message };
}
}
@@ -4079,7 +4082,7 @@ ResultWithMessage Ride::Open(bool isApplying)
{
if (ride_check_track_contains_inversions(&trackElement, &problematicTrackElement))
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_TRACK_UNSUITABLE_FOR_TYPE_OF_TRAIN };
}
}
@@ -4087,7 +4090,7 @@ ResultWithMessage Ride::Open(bool isApplying)
{
if (ride_check_track_contains_banked(&trackElement, &problematicTrackElement))
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_TRACK_UNSUITABLE_FOR_TYPE_OF_TRAIN };
}
}
@@ -4102,13 +4105,13 @@ ResultWithMessage Ride::Open(bool isApplying)
if (!ride_check_station_length(&trackElement, &problematicTrackElement))
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_STATION_NOT_LONG_ENOUGH };
}
if (!ride_check_start_and_end_is_station(&trackElement))
{
ride_scroll_to_track_error(&problematicTrackElement);
ride_scroll_to_track_error(problematicTrackElement);
return { false, STR_RIDE_MUST_START_AND_END_WITH_STATIONS };
}
}

6
src/openrct2/ride/RideConstruction.cpp
View File

@@ -141,7 +141,7 @@ void ride_construct(Ride* ride)
ride_find_track_gap(ride, &trackElement, &trackElement);
rct_window* w = window_get_main();
if (w != nullptr && ride_modify(&trackElement))
if (w != nullptr && ride_modify(trackElement))
window_scroll_to_location(*w, { trackElement, trackElement.element->GetBaseZ() });
}
else
@@ -985,9 +985,9 @@ static bool ride_modify_maze(const CoordsXYE& tileElement)
*
* rct2: 0x006CC056
*/
bool ride_modify(CoordsXYE* input)
bool ride_modify(const CoordsXYE& input)
{
auto tileElement = *input;
auto tileElement = input;
if (tileElement.element == nullptr)
return false;

2
src/openrct2/ride/RideConstruction.h
View File

@@ -88,7 +88,7 @@ void ride_construction_set_default_next_piece();
void ride_select_next_section();
void ride_select_previous_section();
bool ride_modify(CoordsXYE* input);
bool ride_modify(const CoordsXYE& input);
CoordsXYZD ride_get_entrance_or_exit_position_from_screen_position(const ScreenCoordsXY& screenCoords);