mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Use index instead of memmove

Browse Source
This commit is contained in:
ζeh Matt
2017-12-13 17:57:39 +01:00
committed by Michael Steenbeek
parent 5fa292207f
commit 8772d746ce
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/paint/tile_element/Surface.cpp
View File

@@ -641,7 +641,7 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
regs.ah = regs.cl;
while (true)
for(uint32 tunnelIndex = 0; tunnelIndex < TUNNEL_MAX_COUNT; tunnelIndex++)
{
if (curHeight >= regs.al || curHeight >= regs.cl)
{
@@ -666,13 +666,12 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
if (curHeight != tunnelArray[0].height)
{
// Normal walls
while (curHeight > tunnelArray[0].height)
while (curHeight > tunnelArray[tunnelIndex].height)
{
// TODO: Should probably be done by just keeping track of the current index
memmove(&tunnelArray[0], &tunnelArray[1], sizeof(tunnel_entry) * (TUNNEL_MAX_COUNT - 1));
tunnelIndex++;
}
if (isWater == true || curHeight != tunnelArray[0].height)
if (isWater == true || curHeight != tunnelArray[tunnelIndex].height)
{
sub_98196C(session, base_image_id, offset.x, offset.y, bounds.x, bounds.y, 15, curHeight * 16, rotation);
@@ -682,7 +681,7 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
}
// Tunnels
uint8 tunnelType = tunnelArray[0].type;
uint8 tunnelType = tunnelArray[tunnelIndex].type;
uint8 tunnelHeight = stru_97B570[tunnelType][0];
sint16 zOffset = curHeight;
@@ -717,9 +716,6 @@ static void viewport_surface_draw_tile_side_bottom(paint_session * session, enum
sub_98197C(session, image_id, offset.x, offset.y, tunnelBounds.x, tunnelBounds.y, boundBoxLength - 1, curHeight * 16, tunnelTopBoundBoxOffset.x, tunnelTopBoundBoxOffset.y, boundBoxOffsetZ, rotation);
curHeight += stru_97B570[tunnelType][0];
// TODO: Should probably be done by just keeping track of the current index
memmove(&tunnelArray[0], &tunnelArray[1], sizeof(tunnel_entry) * (TUNNEL_MAX_COUNT - 1));
}
}