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

Rename map_set_tile_elements to singular

This commit is contained in:
Tulio Leao 2019-12-21 10:25:08 -03:00
parent d7efe4de90
commit 5fcfc6af00
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -2443,11 +2443,11 @@ static void sub_6CBCE2(
_backupTileElementArrays[2] = map_get_first_element_at(tileCoords.x - 1, tileCoords.y + 0);
_backupTileElementArrays[3] = map_get_first_element_at(tileCoords.x + 0, tileCoords.y + 1);
_backupTileElementArrays[4] = map_get_first_element_at(tileCoords.x + 0, tileCoords.y - 1);
map_set_tile_elements({ tileCoords.x + 0, tileCoords.y + 0 }, &_tempTrackTileElement);
map_set_tile_elements({ tileCoords.x + 1, tileCoords.y + 0 }, &_tempSideTrackTileElement);
map_set_tile_elements({ tileCoords.x - 1, tileCoords.y + 0 }, &_tempSideTrackTileElement);
map_set_tile_elements({ tileCoords.x + 0, tileCoords.y + 1 }, &_tempSideTrackTileElement);
map_set_tile_elements({ tileCoords.x + 0, tileCoords.y - 1 }, &_tempSideTrackTileElement);
map_set_tile_element({ tileCoords.x + 0, tileCoords.y + 0 }, &_tempTrackTileElement);
map_set_tile_element({ tileCoords.x + 1, tileCoords.y + 0 }, &_tempSideTrackTileElement);
map_set_tile_element({ tileCoords.x - 1, tileCoords.y + 0 }, &_tempSideTrackTileElement);
map_set_tile_element({ tileCoords.x + 0, tileCoords.y + 1 }, &_tempSideTrackTileElement);
map_set_tile_element({ tileCoords.x + 0, tileCoords.y - 1 }, &_tempSideTrackTileElement);
// Set the temporary track element
_tempTrackTileElement.SetType(TILE_ELEMENT_TYPE_TRACK);
@ -2469,11 +2469,11 @@ static void sub_6CBCE2(
sub_68B2B7(session, coords);
// Restore map elements
map_set_tile_elements({ tileCoords.x + 0, tileCoords.y + 0 }, _backupTileElementArrays[0]);
map_set_tile_elements({ tileCoords.x + 1, tileCoords.y + 0 }, _backupTileElementArrays[1]);
map_set_tile_elements({ tileCoords.x - 1, tileCoords.y + 0 }, _backupTileElementArrays[2]);
map_set_tile_elements({ tileCoords.x + 0, tileCoords.y + 1 }, _backupTileElementArrays[3]);
map_set_tile_elements({ tileCoords.x + 0, tileCoords.y - 1 }, _backupTileElementArrays[4]);
map_set_tile_element({ tileCoords.x + 0, tileCoords.y + 0 }, _backupTileElementArrays[0]);
map_set_tile_element({ tileCoords.x + 1, tileCoords.y + 0 }, _backupTileElementArrays[1]);
map_set_tile_element({ tileCoords.x - 1, tileCoords.y + 0 }, _backupTileElementArrays[2]);
map_set_tile_element({ tileCoords.x + 0, tileCoords.y + 1 }, _backupTileElementArrays[3]);
map_set_tile_element({ tileCoords.x + 0, tileCoords.y - 1 }, _backupTileElementArrays[4]);
trackBlock++;
}

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

@ -192,7 +192,7 @@ TileElement* map_get_nth_element_at(const CoordsXY& coords, int32_t n)
return nullptr;
}
void map_set_tile_elements(const TileCoordsXY& tilePos, TileElement* elements)
void map_set_tile_element(const TileCoordsXY& tilePos, TileElement* elements)
{
if (!map_is_location_valid(tilePos.ToCoordsXY()))
{

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

@ -138,7 +138,7 @@ void map_strip_ghost_flag_from_elements();
void map_update_tile_pointers();
TileElement* map_get_first_element_at(int32_t x, int32_t y);
TileElement* map_get_nth_element_at(const CoordsXY& coords, int32_t n);
void map_set_tile_elements(const TileCoordsXY& tilePos, TileElement* elements);
void map_set_tile_element(const TileCoordsXY& tilePos, TileElement* elements);
int32_t map_height_from_slope(const CoordsXY& coords, int32_t slope, bool isSloped);
BannerElement* map_get_banner_element_at(const CoordsXYZ& bannerPos, uint8_t direction);
SurfaceElement* map_get_surface_element_at(const CoordsXY& coords);