mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use CoordsXY on Scenery and SmallScenery (#10513)

This commit is contained in:
Tulio Leao 2020-01-04 08:45:51 -03:00 committed by Michael Steenbeek
parent c4a865384e
commit d861658669
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1469,11 +1469,12 @@ void map_update_tiles()
interleaved_xy >>= 1;
}
auto* surfaceElement = map_get_surface_element_at(TileCoordsXY{ x, y }.ToCoordsXY());
auto mapPos = TileCoordsXY{ x, y }.ToCoordsXY();
auto* surfaceElement = map_get_surface_element_at(mapPos);
if (surfaceElement != nullptr)
{
surfaceElement->UpdateGrassLength({ x * 32, y * 32 });
scenery_update_tile(x * 32, y * 32);
surfaceElement->UpdateGrassLength(mapPos);
scenery_update_tile(mapPos);
}
gGrassSceneryTileLoopPosition++;

22
src/openrct2/world/Scenery.cpp
View File

@ -68,11 +68,11 @@ money32 gClearSceneryCost;
// rct2: 0x009A3E74
const CoordsXY SceneryQuadrantOffsets[] = { { 7, 7 }, { 7, 23 }, { 23, 23 }, { 23, 7 } };
void scenery_update_tile(int32_t x, int32_t y)
void scenery_update_tile(const CoordsXY& sceneryPos)
{
TileElement* tileElement;
tileElement = map_get_first_element_at({ x, y });
tileElement = map_get_first_element_at(sceneryPos);
if (tileElement == nullptr)
return;
do
@ -87,7 +87,7 @@ void scenery_update_tile(int32_t x, int32_t y)
if (tileElement->GetType() == TILE_ELEMENT_TYPE_SMALL_SCENERY)
{
scenery_update_age(x, y, tileElement);
scenery_update_age(sceneryPos, tileElement);
}
else if (tileElement->GetType() == TILE_ELEMENT_TYPE_PATH)
{
@ -98,11 +98,11 @@ void scenery_update_tile(int32_t x, int32_t y)
{
if (sceneryEntry->path_bit.flags & PATH_BIT_FLAG_JUMPING_FOUNTAIN_WATER)
{
JumpingFountain::StartAnimation(JUMPING_FOUNTAIN_TYPE_WATER, { x, y }, tileElement);
JumpingFountain::StartAnimation(JUMPING_FOUNTAIN_TYPE_WATER, sceneryPos, tileElement);
}
else if (sceneryEntry->path_bit.flags & PATH_BIT_FLAG_JUMPING_FOUNTAIN_SNOW)
{
JumpingFountain::StartAnimation(JUMPING_FOUNTAIN_TYPE_SNOW, { x, y }, tileElement);
JumpingFountain::StartAnimation(JUMPING_FOUNTAIN_TYPE_SNOW, sceneryPos, tileElement);
}
}
}
@ -114,7 +114,7 @@ void scenery_update_tile(int32_t x, int32_t y)
*
* rct2: 0x006E33D9
*/
void scenery_update_age(int32_t x, int32_t y, TileElement* tileElement)
void scenery_update_age(const CoordsXY& sceneryPos, TileElement* tileElement)
{
TileElement* tileElementAbove;
rct_scenery_entry* sceneryEntry;
@ -133,7 +133,7 @@ void scenery_update_age(int32_t x, int32_t y, TileElement* tileElement)
if (!scenery_small_entry_has_flag(sceneryEntry, SMALL_SCENERY_FLAG_CAN_BE_WATERED)
|| (gClimateCurrent.Weather < WEATHER_RAIN) || (tileElement->AsSmallScenery()->GetAge() < 5))
{
tileElement->AsSmallScenery()->IncreaseAge(x, y);
tileElement->AsSmallScenery()->IncreaseAge(sceneryPos);
return;
}
@ -154,14 +154,14 @@ void scenery_update_age(int32_t x, int32_t y, TileElement* tileElement)
case TILE_ELEMENT_TYPE_LARGE_SCENERY:
case TILE_ELEMENT_TYPE_ENTRANCE:
case TILE_ELEMENT_TYPE_PATH:
map_invalidate_tile_zoom1({ x, y, tileElementAbove->GetBaseZ(), tileElementAbove->GetClearanceZ() });
tileElement->AsSmallScenery()->IncreaseAge(x, y);
map_invalidate_tile_zoom1({ sceneryPos, tileElementAbove->GetBaseZ(), tileElementAbove->GetClearanceZ() });
tileElement->AsSmallScenery()->IncreaseAge(sceneryPos);
return;
case TILE_ELEMENT_TYPE_SMALL_SCENERY:
sceneryEntry = tileElementAbove->AsSmallScenery()->GetEntry();
if (scenery_small_entry_has_flag(sceneryEntry, SMALL_SCENERY_FLAG_VOFFSET_CENTRE))
{
tileElement->AsSmallScenery()->IncreaseAge(x, y);
tileElement->AsSmallScenery()->IncreaseAge(sceneryPos);
return;
}
break;
@ -170,7 +170,7 @@ void scenery_update_age(int32_t x, int32_t y, TileElement* tileElement)
// Reset age / water plant
tileElement->AsSmallScenery()->SetAge(0);
map_invalidate_tile_zoom1({ x, y, tileElement->GetBaseZ(), tileElement->GetClearanceZ() });
map_invalidate_tile_zoom1({ sceneryPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() });
}
/**

4
src/openrct2/world/Scenery.h
View File

@ -283,8 +283,8 @@ extern const CoordsXY SceneryQuadrantOffsets[];
extern money32 gClearSceneryCost;
void init_scenery();
void scenery_update_tile(int32_t x, int32_t y);
void scenery_update_age(int32_t x, int32_t y, TileElement* tileElement);
void scenery_update_tile(const CoordsXY& sceneryPos);
void scenery_update_age(const CoordsXY& sceneryPos, TileElement* tileElement);
void scenery_set_default_placement_configuration();
void scenery_remove_ghost_tool_placement();

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

@ -112,7 +112,7 @@ void SmallSceneryElement::SetAge(uint8_t newAge)
this->age = newAge;
}
void SmallSceneryElement::IncreaseAge(int32_t x, int32_t y)
void SmallSceneryElement::IncreaseAge(const CoordsXY& sceneryPos)
{
if (IsGhost())
return;
@ -128,7 +128,7 @@ void SmallSceneryElement::IncreaseAge(int32_t x, int32_t y)
if (scenery_small_entry_has_flag(entry, SMALL_SCENERY_FLAG_CAN_WITHER))
{
map_invalidate_tile_zoom1({ x, y, GetBaseZ(), GetClearanceZ() });
map_invalidate_tile_zoom1({ sceneryPos, GetBaseZ(), GetClearanceZ() });
}
}
}

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

@ -371,7 +371,7 @@ public:
rct_scenery_entry* GetEntry() const;
uint8_t GetAge() const;
void SetAge(uint8_t newAge);
void IncreaseAge(int32_t x, int32_t y);
void IncreaseAge(const CoordsXY& sceneryPos);
uint8_t GetSceneryQuadrant() const;
void SetSceneryQuadrant(uint8_t newQuadrant);
colour_t GetPrimaryColour() const;