mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 04:53:12 +01:00
Code Issues Releases Wiki Activity

Make litter_can_be_at use CoordsXYZ

Browse Source
This commit is contained in:
Tulio Leao
2020-06-21 14:14:44 -03:00
parent 40a7dfbb24
commit 3c75481d8a
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/Sprite.cpp
View File

@@ -758,14 +758,14 @@ void sprite_remove(SpriteBase* sprite)
*spriteIndex = sprite->next_in_quadrant;
}
static bool litter_can_be_at(int32_t x, int32_t y, int32_t z)
static bool litter_can_be_at(const CoordsXYZ& mapPos)
{
TileElement* tileElement;
if (!map_is_location_owned({ x, y, z }))
if (!map_is_location_owned(mapPos))
return false;
tileElement = map_get_first_element_at({ x, y });
tileElement = map_get_first_element_at(mapPos);
if (tileElement == nullptr)
return false;
do
@@ -774,7 +774,7 @@ static bool litter_can_be_at(int32_t x, int32_t y, int32_t z)
continue;
int32_t pathZ = tileElement->GetBaseZ();
if (pathZ < z || pathZ >= z + 32)
if (pathZ < mapPos.z || pathZ >= mapPos.z + 32)
continue;
return !tile_element_is_underground(tileElement);
@@ -795,7 +795,7 @@ void litter_create(const CoordsXYZD& litterPos, int32_t type)
+ CoordsXY{ CoordsDirectionDelta[litterPos.direction >> 3].x / 8,
CoordsDirectionDelta[litterPos.direction >> 3].y / 8 };
if (!litter_can_be_at(offsetLitterPos.x, offsetLitterPos.y, offsetLitterPos.z))
if (!litter_can_be_at(offsetLitterPos))
return;
if (gSpriteListCount[SPRITE_LIST_LITTER] >= 500)