mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-11 01:52:32 +01:00
Code Issues Releases Wiki Activity

Fix #5398: Mini Maze.TD4 causes weird behaviour and crashes

Browse Source
This commit is contained in:
Michael Steenbeek
2018-01-06 18:26:28 +01:00
committed by GitHub
parent 15a4f67f14
commit 1fa25739fb
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -45,6 +45,7 @@
- Fix: [#4991] Inverted helices can be built on the Lay Down RC, but are not drawn. - Fix: [#4991] Inverted helices can be built on the Lay Down RC, but are not drawn.
- Fix: [#5190] Cannot build Wild Mouse - Flying Dutchman Gold Mine. - Fix: [#5190] Cannot build Wild Mouse - Flying Dutchman Gold Mine.
- Fix: [#5224] Multiplayer window is not closed when server shuts down. - Fix: [#5224] Multiplayer window is not closed when server shuts down.
- Fix: [#5398] Attempting to place Mini Maze.TD4 results in weird behaviour and crashes.
- Fix: [#5417] Hacked Crooked House tracked rides do not dispatch vehicles. - Fix: [#5417] Hacked Crooked House tracked rides do not dispatch vehicles.
- Fix: [#5445] Patrol area not imported from RCT1 saves and scenarios. - Fix: [#5445] Patrol area not imported from RCT1 saves and scenarios.
- Fix: [#5585] Inconsistent zooming with mouse wheel. - Fix: [#5585] Inconsistent zooming with mouse wheel.

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

@@ -81,7 +81,7 @@ static void track_design_preview_clear_map();
static void td6_reset_trailing_elements(rct_track_td6 * td6); static void td6_reset_trailing_elements(rct_track_td6 * td6);
static void td6_set_element_helper_pointers(rct_track_td6 * td6); static void td6_set_element_helper_pointers(rct_track_td6 * td6, bool clearScenery);
rct_track_td6 * track_design_open(const utf8 * path) rct_track_td6 * track_design_open(const utf8 * path)
{ {
@@ -321,7 +321,7 @@ static rct_track_td6 * track_design_open_from_td4(uint8 * src, size_t srcLength)
td6->elementsSize = td4->elementsSize; td6->elementsSize = td4->elementsSize;
td6_reset_trailing_elements(td6); td6_reset_trailing_elements(td6);
td6_set_element_helper_pointers(td6); td6_set_element_helper_pointers(td6, true);
SafeFree(td4); SafeFree(td4);
return td6; return td6;
@@ -360,7 +360,7 @@ static rct_track_td6 * track_design_open_from_buffer(uint8 * src, size_t srcLeng
// Cap operation setting // Cap operation setting
td6->operation_setting = Math::Min(td6->operation_setting, RideProperties[td6->type].max_value); td6->operation_setting = Math::Min(td6->operation_setting, RideProperties[td6->type].max_value);
td6_set_element_helper_pointers(td6); td6_set_element_helper_pointers(td6, false);
return td6; return td6;
} }
@@ -375,6 +375,9 @@ static void td6_reset_trailing_elements(rct_track_td6 * td6)
mazeElement++; mazeElement++;
} }
lastElement = (void *) ((uintptr_t) mazeElement + 1); lastElement = (void *) ((uintptr_t) mazeElement + 1);
size_t trailingSize = td6->elementsSize - (size_t)((uintptr_t) lastElement - (uintptr_t) td6->elements);
memset(lastElement, 0, trailingSize);
} }
else else
{ {
@@ -384,14 +387,21 @@ static void td6_reset_trailing_elements(rct_track_td6 * td6)
trackElement++; trackElement++;
} }
lastElement = (void *) ((uintptr_t) trackElement + 1); lastElement = (void *) ((uintptr_t) trackElement + 1);
size_t trailingSize = td6->elementsSize - (size_t)((uintptr_t) lastElement - (uintptr_t) td6->elements);
memset(lastElement, 0xFF, trailingSize);
} }
size_t trailingSize = td6->elementsSize - (size_t)((uintptr_t) lastElement - (uintptr_t) td6->elements);
memset(lastElement, 0xFF, trailingSize);
} }
static void td6_set_element_helper_pointers(rct_track_td6 * td6) /**
*
* @param td6
* @param clearScenery Set when importing TD4 designs, to avoid corrupted data being interpreted as scenery.
*/
static void td6_set_element_helper_pointers(rct_track_td6 * td6, bool clearScenery)
{ {
uintptr_t sceneryElementsStart; uintptr_t sceneryElementsStart;
if (td6->type == RIDE_TYPE_MAZE) if (td6->type == RIDE_TYPE_MAZE)
{ {
td6->track_elements = nullptr; td6->track_elements = nullptr;
@@ -422,8 +432,15 @@ static void td6_set_element_helper_pointers(rct_track_td6 * td6)
sceneryElementsStart = (uintptr_t) entranceElement + 1; sceneryElementsStart = (uintptr_t) entranceElement + 1;
} }
rct_td6_scenery_element * sceneryElement = (rct_td6_scenery_element *) sceneryElementsStart; if (clearScenery)
td6->scenery_elements = sceneryElement; {
td6->scenery_elements = nullptr;
}
else
{
rct_td6_scenery_element * sceneryElement = (rct_td6_scenery_element *) sceneryElementsStart;
td6->scenery_elements = sceneryElement;
}
} }
void track_design_dispose(rct_track_td6 * td6) void track_design_dispose(rct_track_td6 * td6)