mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 23:34:37 +01:00
Code Issues Releases Wiki Activity

Use small scenery element as return

Browse Source
This commit is contained in:
duncanspumpkin
2019-03-16 16:29:02 +00:00
parent c80c7b5cd2
commit 2c2239b131
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/world/Map.cpp
View File

@@ -2966,7 +2966,7 @@ EntranceElement* map_get_ride_exit_element_at(int32_t x, int32_t y, int32_t z, b
return nullptr;
}
TileElement* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t z, int32_t type, uint8_t quadrant)
SmallSceneryElement* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t z, int32_t type, uint8_t quadrant)
{
TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5);
if (tileElement != nullptr)
@@ -2982,7 +2982,7 @@ TileElement* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t z, i
if (tileElement->AsSmallScenery()->GetEntryIndex() != type)
continue;
return tileElement;
return tileElement->AsSmallScenery();
} while (!(tileElement++)->IsLastForTile());
}
return nullptr;

2
src/openrct2/world/Map.h
View File

@@ -147,7 +147,7 @@ TileElement* map_get_surface_element_at(int32_t x, int32_t y);
TileElement* map_get_surface_element_at(CoordsXY coords);
TileElement* map_get_path_element_at(int32_t x, int32_t y, int32_t z);
TileElement* map_get_wall_element_at(int32_t x, int32_t y, int32_t z, int32_t direction);
TileElement* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t z, int32_t type, uint8_t quadrant);
SmallSceneryElement* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t z, int32_t type, uint8_t quadrant);
EntranceElement* map_get_park_entrance_element_at(int32_t x, int32_t y, int32_t z, bool ghost);
EntranceElement* map_get_ride_entrance_element_at(int32_t x, int32_t y, int32_t z, bool ghost);
EntranceElement* map_get_ride_exit_element_at(int32_t x, int32_t y, int32_t z, bool ghost);

6
src/openrct2/world/SmallScenery.cpp
View File

@@ -42,7 +42,7 @@ static money32 SmallScenerySetColour(
}
}
TileElement* tileElement = map_get_small_scenery_element_at(x, y, baseHeight, sceneryType, quadrant);
auto tileElement = map_get_small_scenery_element_at(x, y, baseHeight, sceneryType, quadrant);
if (tileElement == nullptr)
{
@@ -56,8 +56,8 @@ static money32 SmallScenerySetColour(
if (flags & GAME_COMMAND_FLAG_APPLY)
{
tileElement->AsSmallScenery()->SetPrimaryColour(primaryColour);
tileElement->AsSmallScenery()->SetSecondaryColour(secondaryColour);
tileElement->SetPrimaryColour(primaryColour);
tileElement->SetSecondaryColour(secondaryColour);
map_invalidate_tile_full(x, y);
}