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

Replace GetSurfaceStyleAtLocation with map_get_surface_element_at

Browse Source 
There exists a helper function map_get_surface_element_at which already searches a tile's element list for the surface element, so we can just use that.
This commit is contained in:
Richard Fine
2018-12-30 11:47:30 +00:00
parent f4685f7b94
commit 49e46f8940
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/tests/Pathfinding.cpp
View File

@@ -122,7 +122,7 @@ protected:
{
const uint32_t forbiddenSurfaceStyle = 8u;
const uint32_t style = GetSurfaceStyleAtLocation(TileCoordsXY(location.x, location.y));
const uint32_t style = map_get_surface_element_at(location.x, location.y)->AsSurface()->GetSurfaceStyle();
if (style == forbiddenSurfaceStyle)
return ::testing::AssertionFailure()
@@ -134,21 +134,9 @@ protected:
private:
static uint32_t GetSurfaceStyleAtLocation(const TileCoordsXY& location)
{
TileElement* element = map_get_first_element_at(location.x, location.y);
// Every tile *should* have a surface sprite, so we should be guaranteed to find
// something before we go off the end of the data.
while (element->GetType() != TILE_ELEMENT_TYPE_SURFACE)
element++;
return element->AsSurface()->GetSurfaceStyle();
}
static ::testing::AssertionResult AssertPositionIsSetUp(const char* positionKind, uint32_t expectedSurfaceStyle, const TileCoordsXYZ& location)
{
const uint32_t style = GetSurfaceStyleAtLocation(TileCoordsXY(location.x, location.y));
const uint32_t style = map_get_surface_element_at(location.x, location.y)->AsSurface()->GetSurfaceStyle();
if (style != expectedSurfaceStyle)
return ::testing::AssertionFailure()