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

Merge pull request #10061 from tupaschoal/nullptr-deref-consistency

Browse Source 
Make check for map_get_nth_element_at consistent
This commit is contained in:
ζeh Matt
2019-10-08 17:08:52 +02:00
committed by GitHub
parent 77ce09a706 4a817b88d9
commit dd6d028c5b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/world/TileInspector.cpp
View File

@@ -99,7 +99,7 @@ GameActionResult::Ptr tile_inspector_insert_corrupt_at(CoordsXY loc, int16_t ele
// Set the base height to be the same as the selected element // Set the base height to be the same as the selected element
TileElement* const selectedElement = map_get_nth_element_at(loc.x / 32, loc.y / 32, elementIndex + 1); TileElement* const selectedElement = map_get_nth_element_at(loc.x / 32, loc.y / 32, elementIndex + 1);
if (!selectedElement) if (selectedElement == nullptr)
{ {
return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE); return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE);
} }
@@ -153,7 +153,7 @@ GameActionResult::Ptr tile_inspector_remove_element_at(CoordsXY loc, int16_t ele
{ {
// Forcefully remove the element // Forcefully remove the element
TileElement* const tileElement = map_get_nth_element_at(loc.x / 32, loc.y / 32, elementIndex); TileElement* const tileElement = map_get_nth_element_at(loc.x / 32, loc.y / 32, elementIndex);
if (!tileElement) if (tileElement == nullptr)
{ {
return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE); return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE);
} }
@@ -218,7 +218,7 @@ GameActionResult::Ptr tile_inspector_rotate_element_at(CoordsXY loc, int32_t ele
uint8_t newRotation, pathEdges, pathCorners; uint8_t newRotation, pathEdges, pathCorners;
TileElement* const tileElement = map_get_nth_element_at(loc.x / 32, loc.y / 32, elementIndex); TileElement* const tileElement = map_get_nth_element_at(loc.x / 32, loc.y / 32, elementIndex);
if (!tileElement) if (tileElement == nullptr)
{ {
return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE); return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE);
} }
@@ -741,11 +741,11 @@ GameActionResult::Ptr tile_inspector_wall_set_slope(CoordsXY loc, int32_t elemen
GameActionResult::Ptr tile_inspector_track_base_height_offset( GameActionResult::Ptr tile_inspector_track_base_height_offset(
CoordsXY loc, int32_t elementIndex, int8_t offset, bool isExecuting) CoordsXY loc, int32_t elementIndex, int8_t offset, bool isExecuting)
{ {
TileElement* const trackElement = map_get_nth_element_at(loc.x / 32, loc.y / 32, elementIndex);
if (offset == 0) if (offset == 0)
return std::make_unique<GameActionResult>(); return std::make_unique<GameActionResult>();
TileElement* const trackElement = map_get_nth_element_at(loc.x / 32, loc.y / 32, elementIndex);
if (trackElement == nullptr || trackElement->GetType() != TILE_ELEMENT_TYPE_TRACK) if (trackElement == nullptr || trackElement->GetType() != TILE_ELEMENT_TYPE_TRACK)
return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE); return std::make_unique<GameActionResult>(GA_ERROR::UNKNOWN, STR_NONE);