mirror of https://github.com/OpenRCT2/OpenRCT2.git
Refactor uses of PaintAddImageAsParent in Paint.Path.cpp
This commit is contained in:
parent
58df44efc3
commit
2aed03ca5f
|
@ -108,7 +108,7 @@ static void path_bit_lights_paint(
|
||||||
|
|
||||||
imageId |= pathBitImageFlags;
|
imageId |= pathBitImageFlags;
|
||||||
|
|
||||||
PaintAddImageAsParent(session, imageId, 2, 16, 1, 1, 23, height, 3, 16, height + 2);
|
PaintAddImageAsParent(session, imageId, { 2, 16, height }, { 1, 1, 23 }, { 3, 16, height + 2 });
|
||||||
}
|
}
|
||||||
if (!(edges & EDGE_SE))
|
if (!(edges & EDGE_SE))
|
||||||
{
|
{
|
||||||
|
@ -119,7 +119,7 @@ static void path_bit_lights_paint(
|
||||||
|
|
||||||
imageId |= pathBitImageFlags;
|
imageId |= pathBitImageFlags;
|
||||||
|
|
||||||
PaintAddImageAsParent(session, imageId, 16, 30, 1, 0, 23, height, 16, 29, height + 2);
|
PaintAddImageAsParent(session, imageId, { 16, 30, height }, { 1, 0, 23 }, { 16, 29, height + 2 });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(edges & EDGE_SW))
|
if (!(edges & EDGE_SW))
|
||||||
|
@ -131,7 +131,7 @@ static void path_bit_lights_paint(
|
||||||
|
|
||||||
imageId |= pathBitImageFlags;
|
imageId |= pathBitImageFlags;
|
||||||
|
|
||||||
PaintAddImageAsParent(session, imageId, 30, 16, 0, 1, 23, height, 29, 16, height + 2);
|
PaintAddImageAsParent(session, imageId, { 30, 16, height }, { 0, 1, 23 }, { 29, 16, height + 2 });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(edges & EDGE_NW))
|
if (!(edges & EDGE_NW))
|
||||||
|
@ -143,7 +143,7 @@ static void path_bit_lights_paint(
|
||||||
|
|
||||||
imageId |= pathBitImageFlags;
|
imageId |= pathBitImageFlags;
|
||||||
|
|
||||||
PaintAddImageAsParent(session, imageId, 16, 2, 1, 1, 23, height, 16, 3, height + 2);
|
PaintAddImageAsParent(session, imageId, { 16, 2, height }, { 1, 1, 23 }, { 16, 3, height + 2 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -177,7 +177,7 @@ static void path_bit_bins_paint(
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
|
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
|
||||||
PaintAddImageAsParent(session, imageId, 7, 16, 1, 1, 7, height, 7, 16, height + 2);
|
PaintAddImageAsParent(session, imageId, { 7, 16, height }, { 1, 1, 7 }, { 7, 16, height + 2 });
|
||||||
}
|
}
|
||||||
if (!(edges & EDGE_SE))
|
if (!(edges & EDGE_SE))
|
||||||
{
|
{
|
||||||
|
@ -198,7 +198,7 @@ static void path_bit_bins_paint(
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
|
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
|
||||||
PaintAddImageAsParent(session, imageId, 16, 25, 1, 1, 7, height, 16, 25, height + 2);
|
PaintAddImageAsParent(session, imageId, { 16, 25, height }, { 1, 1, 7 }, { 16, 25, height + 2 });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(edges & EDGE_SW))
|
if (!(edges & EDGE_SW))
|
||||||
|
@ -220,7 +220,7 @@ static void path_bit_bins_paint(
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
|
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
|
||||||
PaintAddImageAsParent(session, imageId, 25, 16, 1, 1, 7, height, 25, 16, height + 2);
|
PaintAddImageAsParent(session, imageId, { 25, 16, height }, { 1, 1, 7 }, { 25, 16, height + 2 });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(edges & EDGE_NW))
|
if (!(edges & EDGE_NW))
|
||||||
|
@ -242,7 +242,7 @@ static void path_bit_bins_paint(
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
|
if (!(session->ViewFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) || binIsFull || binsAreVandalised)
|
||||||
PaintAddImageAsParent(session, imageId, 16, 7, 1, 1, 7, height, 16, 7, height + 2);
|
PaintAddImageAsParent(session, imageId, { 16, 7, height }, { 1, 1, 7 }, { 16, 7, height + 2 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -262,7 +262,7 @@ static void path_bit_benches_paint(
|
||||||
|
|
||||||
imageId |= pathBitImageFlags;
|
imageId |= pathBitImageFlags;
|
||||||
|
|
||||||
PaintAddImageAsParent(session, imageId, 7, 16, 0, 16, 7, height, 6, 8, height + 2);
|
PaintAddImageAsParent(session, imageId, { 7, 16, height }, { 0, 16, 7 }, { 6, 8, height + 2 });
|
||||||
}
|
}
|
||||||
if (!(edges & EDGE_SE))
|
if (!(edges & EDGE_SE))
|
||||||
{
|
{
|
||||||
|
@ -273,7 +273,7 @@ static void path_bit_benches_paint(
|
||||||
|
|
||||||
imageId |= pathBitImageFlags;
|
imageId |= pathBitImageFlags;
|
||||||
|
|
||||||
PaintAddImageAsParent(session, imageId, 16, 25, 16, 0, 7, height, 8, 23, height + 2);
|
PaintAddImageAsParent(session, imageId, { 16, 25, height }, { 16, 0, 7 }, { 8, 23, height + 2 });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(edges & EDGE_SW))
|
if (!(edges & EDGE_SW))
|
||||||
|
@ -285,7 +285,7 @@ static void path_bit_benches_paint(
|
||||||
|
|
||||||
imageId |= pathBitImageFlags;
|
imageId |= pathBitImageFlags;
|
||||||
|
|
||||||
PaintAddImageAsParent(session, imageId, 25, 16, 0, 16, 7, height, 23, 8, height + 2);
|
PaintAddImageAsParent(session, imageId, { 25, 16, height }, { 0, 16, 7 }, { 23, 8, height + 2 });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(edges & EDGE_NW))
|
if (!(edges & EDGE_NW))
|
||||||
|
@ -297,7 +297,7 @@ static void path_bit_benches_paint(
|
||||||
|
|
||||||
imageId |= pathBitImageFlags;
|
imageId |= pathBitImageFlags;
|
||||||
|
|
||||||
PaintAddImageAsParent(session, imageId, 16, 7, 16, 0, 7, height, 8, 6, height + 2);
|
PaintAddImageAsParent(session, imageId, { 16, 7, height }, { 16, 0, 7 }, { 8, 6, height + 2 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -311,10 +311,10 @@ static void path_bit_jumping_fountains_paint(
|
||||||
uint32_t imageId = pathBitEntry->image;
|
uint32_t imageId = pathBitEntry->image;
|
||||||
imageId |= pathBitImageFlags;
|
imageId |= pathBitImageFlags;
|
||||||
|
|
||||||
PaintAddImageAsParent(session, imageId + 1, 0, 0, 1, 1, 2, height, 3, 3, height + 2);
|
PaintAddImageAsParent(session, imageId + 1, { 0, 0, height }, { 1, 1, 2 }, { 3, 3, height + 2 });
|
||||||
PaintAddImageAsParent(session, imageId + 2, 0, 0, 1, 1, 2, height, 3, 29, height + 2);
|
PaintAddImageAsParent(session, imageId + 2, { 0, 0, height }, { 1, 1, 2 }, { 3, 29, height + 2 });
|
||||||
PaintAddImageAsParent(session, imageId + 3, 0, 0, 1, 1, 2, height, 29, 29, height + 2);
|
PaintAddImageAsParent(session, imageId + 3, { 0, 0, height }, { 1, 1, 2 }, { 29, 29, height + 2 });
|
||||||
PaintAddImageAsParent(session, imageId + 4, 0, 0, 1, 1, 2, height, 29, 3, height + 2);
|
PaintAddImageAsParent(session, imageId + 4, { 0, 0, height }, { 1, 1, 2 }, { 29, 3, height + 2 });
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -336,20 +336,20 @@ static void sub_6A4101(
|
||||||
& FOOTPATH_PROPERTIES_SLOPE_DIRECTION_MASK)
|
& FOOTPATH_PROPERTIES_SLOPE_DIRECTION_MASK)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
PaintAddImageAsParent(session, 22 + base_image_id, 0, 4, 32, 1, 23, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 22 + base_image_id, { 0, 4, height }, { 32, 1, 23 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 22 + base_image_id, 0, 28, 32, 1, 23, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 22 + base_image_id, { 0, 28, height }, { 32, 1, 23 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
PaintAddImageAsParent(session, 21 + base_image_id, 4, 0, 1, 32, 23, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 21 + base_image_id, { 4, 0, height }, { 1, 32, 23 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 21 + base_image_id, 28, 0, 1, 32, 23, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 21 + base_image_id, { 28, 0, height }, { 1, 32, 23 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
PaintAddImageAsParent(session, 23 + base_image_id, 0, 4, 32, 1, 23, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 23 + base_image_id, { 0, 4, height }, { 32, 1, 23 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 23 + base_image_id, 0, 28, 32, 1, 23, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 23 + base_image_id, { 0, 28, height }, { 32, 1, 23 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
PaintAddImageAsParent(session, 20 + base_image_id, 4, 0, 1, 32, 23, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 20 + base_image_id, { 4, 0, height }, { 1, 32, 23 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 20 + base_image_id, 28, 0, 1, 32, 23, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 20 + base_image_id, { 28, 0, height }, { 1, 32, 23 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -358,52 +358,52 @@ static void sub_6A4101(
|
||||||
switch (local_ebp)
|
switch (local_ebp)
|
||||||
{
|
{
|
||||||
case 1:
|
case 1:
|
||||||
PaintAddImageAsParent(session, 17 + base_image_id, 0, 4, 28, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 17 + base_image_id, { 0, 4, height }, { 28, 1, 7 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 17 + base_image_id, 0, 28, 28, 1, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 17 + base_image_id, { 0, 28, height }, { 28, 1, 7 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
PaintAddImageAsParent(session, 18 + base_image_id, 4, 0, 1, 28, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 18 + base_image_id, { 4, 0, height }, { 1, 28, 7 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 18 + base_image_id, 28, 0, 1, 28, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 18 + base_image_id, { 28, 0, height }, { 1, 28, 7 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
PaintAddImageAsParent(session, 17 + base_image_id, 0, 4, 28, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 17 + base_image_id, { 0, 4, height }, { 28, 1, 7 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(
|
PaintAddImageAsParent(
|
||||||
session, 18 + base_image_id, 28, 0, 1, 28, 7, height, 28, 4,
|
session, 18 + base_image_id, 28, 0, 1, 28, 7, height, 28, 4,
|
||||||
height + 2); // bound_box_offset_y seems to be a bug
|
height + 2); // bound_box_offset_y seems to be a bug
|
||||||
PaintAddImageAsParent(session, 25 + base_image_id, 0, 0, 4, 4, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 25 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
PaintAddImageAsParent(session, 19 + base_image_id, 0, 4, 28, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 19 + base_image_id, { 0, 4, height }, { 28, 1, 7 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 19 + base_image_id, 0, 28, 28, 1, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 19 + base_image_id, { 0, 28, height }, { 28, 1, 7 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
PaintAddImageAsParent(session, 15 + base_image_id, 0, 4, 32, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 15 + base_image_id, { 0, 4, height }, { 32, 1, 7 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 15 + base_image_id, 0, 28, 32, 1, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 15 + base_image_id, { 0, 28, height }, { 32, 1, 7 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 6:
|
case 6:
|
||||||
PaintAddImageAsParent(session, 18 + base_image_id, 4, 0, 1, 28, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 18 + base_image_id, { 4, 0, height }, { 1, 28, 7 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 19 + base_image_id, 0, 4, 28, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 19 + base_image_id, { 0, 4, height }, { 28, 1, 7 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 26 + base_image_id, 0, 0, 4, 4, 7, height, 28, 28, height + 2);
|
PaintAddImageAsParent(session, 26 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 28, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 8:
|
case 8:
|
||||||
PaintAddImageAsParent(session, 16 + base_image_id, 4, 0, 1, 28, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 16 + base_image_id, { 4, 0, height }, { 1, 28, 7 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 16 + base_image_id, 28, 0, 1, 28, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 16 + base_image_id, { 28, 0, height }, { 1, 28, 7 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 9:
|
case 9:
|
||||||
PaintAddImageAsParent(session, 16 + base_image_id, 28, 0, 1, 28, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 16 + base_image_id, { 28, 0, height }, { 1, 28, 7 }, { 28, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 17 + base_image_id, 0, 28, 28, 1, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 17 + base_image_id, { 0, 28, height }, { 28, 1, 7 }, { 0, 28, height + 2 });
|
||||||
PaintAddImageAsParent(session, 24 + base_image_id, 0, 0, 4, 4, 7, height, 0, 0, height + 2);
|
PaintAddImageAsParent(session, 24 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 0, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 10:
|
case 10:
|
||||||
PaintAddImageAsParent(session, 14 + base_image_id, 4, 0, 1, 32, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 14 + base_image_id, { 4, 0, height }, { 1, 32, 7 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 14 + base_image_id, 28, 0, 1, 32, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 14 + base_image_id, { 28, 0, height }, { 1, 32, 7 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 12:
|
case 12:
|
||||||
PaintAddImageAsParent(session, 16 + base_image_id, 4, 0, 1, 28, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 16 + base_image_id, { 4, 0, height }, { 1, 28, 7 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(
|
PaintAddImageAsParent(
|
||||||
session, 19 + base_image_id, 0, 28, 28, 1, 7, height, 4, 28,
|
session, 19 + base_image_id, 0, 28, 28, 1, 7, height, 4, 28,
|
||||||
height + 2); // bound_box_offset_x seems to be a bug
|
height + 2); // bound_box_offset_x seems to be a bug
|
||||||
PaintAddImageAsParent(session, 27 + base_image_id, 0, 0, 4, 4, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 27 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
// purposely left empty
|
// purposely left empty
|
||||||
|
@ -501,20 +501,20 @@ static void sub_6A4101(
|
||||||
& FOOTPATH_PROPERTIES_SLOPE_DIRECTION_MASK)
|
& FOOTPATH_PROPERTIES_SLOPE_DIRECTION_MASK)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
PaintAddImageAsParent(session, 8 + base_image_id, 0, 4, 32, 1, 23, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 8 + base_image_id, { 0, 4, height }, { 32, 1, 23 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 8 + base_image_id, 0, 28, 32, 1, 23, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 8 + base_image_id, { 0, 28, height }, { 32, 1, 23 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
PaintAddImageAsParent(session, 7 + base_image_id, 4, 0, 1, 32, 23, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 7 + base_image_id, { 4, 0, height }, { 1, 32, 23 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 7 + base_image_id, 28, 0, 1, 32, 23, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 7 + base_image_id, { 28, 0, height }, { 1, 32, 23 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
PaintAddImageAsParent(session, 9 + base_image_id, 0, 4, 32, 1, 23, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 9 + base_image_id, { 0, 4, height }, { 32, 1, 23 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 9 + base_image_id, 0, 28, 32, 1, 23, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 9 + base_image_id, { 0, 28, height }, { 32, 1, 23 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
PaintAddImageAsParent(session, 6 + base_image_id, 4, 0, 1, 32, 23, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 6 + base_image_id, { 4, 0, height }, { 1, 32, 23 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 6 + base_image_id, 28, 0, 1, 32, 23, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 6 + base_image_id, { 28, 0, height }, { 1, 32, 23 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -531,128 +531,128 @@ static void sub_6A4101(
|
||||||
// purposely left empty
|
// purposely left empty
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
PaintAddImageAsParent(session, 3 + base_image_id, 0, 4, 28, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 3 + base_image_id, { 0, 4, height }, { 28, 1, 7 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 3 + base_image_id, 0, 28, 28, 1, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 3 + base_image_id, { 0, 28, height }, { 28, 1, 7 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
PaintAddImageAsParent(session, 4 + base_image_id, 4, 0, 1, 28, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 4 + base_image_id, { 4, 0, height }, { 1, 28, 7 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 4 + base_image_id, 28, 0, 1, 28, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 4 + base_image_id, { 28, 0, height }, { 1, 28, 7 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
PaintAddImageAsParent(session, 5 + base_image_id, 0, 4, 28, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 5 + base_image_id, { 0, 4, height }, { 28, 1, 7 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 5 + base_image_id, 0, 28, 28, 1, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 5 + base_image_id, { 0, 28, height }, { 28, 1, 7 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
PaintAddImageAsParent(session, 1 + base_image_id, 0, 4, 32, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 1 + base_image_id, { 0, 4, height }, { 32, 1, 7 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(session, 1 + base_image_id, 0, 28, 32, 1, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 1 + base_image_id, { 0, 28, height }, { 32, 1, 7 }, { 0, 28, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 8:
|
case 8:
|
||||||
PaintAddImageAsParent(session, 2 + base_image_id, 4, 0, 1, 28, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 2 + base_image_id, { 4, 0, height }, { 1, 28, 7 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 2 + base_image_id, 28, 0, 1, 28, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 2 + base_image_id, { 28, 0, height }, { 1, 28, 7 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
case 10:
|
case 10:
|
||||||
PaintAddImageAsParent(session, 0 + base_image_id, 4, 0, 1, 32, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 0 + base_image_id, { 4, 0, height }, { 1, 32, 7 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 0 + base_image_id, 28, 0, 1, 32, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 0 + base_image_id, { 28, 0, height }, { 1, 32, 7 }, { 28, 0, height + 2 });
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
PaintAddImageAsParent(session, 3 + base_image_id, 0, 4, 28, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 3 + base_image_id, { 0, 4, height }, { 28, 1, 7 }, { 0, 4, height + 2 });
|
||||||
PaintAddImageAsParent(
|
PaintAddImageAsParent(
|
||||||
session, 4 + base_image_id, 28, 0, 1, 28, 7, height, 28, 4,
|
session, 4 + base_image_id, 28, 0, 1, 28, 7, height, 28, 4,
|
||||||
height + 2); // bound_box_offset_y seems to be a bug
|
height + 2); // bound_box_offset_y seems to be a bug
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_0))
|
if (!(drawnCorners & FOOTPATH_CORNER_0))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 11 + base_image_id, 0, 0, 4, 4, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 11 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 0, 28, height + 2 });
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 6:
|
case 6:
|
||||||
PaintAddImageAsParent(session, 4 + base_image_id, 4, 0, 1, 28, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 4 + base_image_id, { 4, 0, height }, { 1, 28, 7 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 5 + base_image_id, 0, 4, 28, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 5 + base_image_id, { 0, 4, height }, { 28, 1, 7 }, { 0, 4, height + 2 });
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_1))
|
if (!(drawnCorners & FOOTPATH_CORNER_1))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 12 + base_image_id, 0, 0, 4, 4, 7, height, 28, 28, height + 2);
|
PaintAddImageAsParent(session, 12 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 28, 28, height + 2 });
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 9:
|
case 9:
|
||||||
PaintAddImageAsParent(session, 2 + base_image_id, 28, 0, 1, 28, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 2 + base_image_id, { 28, 0, height }, { 1, 28, 7 }, { 28, 0, height + 2 });
|
||||||
PaintAddImageAsParent(session, 3 + base_image_id, 0, 28, 28, 1, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 3 + base_image_id, { 0, 28, height }, { 28, 1, 7 }, { 0, 28, height + 2 });
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_3))
|
if (!(drawnCorners & FOOTPATH_CORNER_3))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 10 + base_image_id, 0, 0, 4, 4, 7, height, 0, 0, height + 2);
|
PaintAddImageAsParent(session, 10 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 0, 0, height + 2 });
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 12:
|
case 12:
|
||||||
PaintAddImageAsParent(session, 2 + base_image_id, 4, 0, 1, 28, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 2 + base_image_id, { 4, 0, height }, { 1, 28, 7 }, { 4, 0, height + 2 });
|
||||||
PaintAddImageAsParent(
|
PaintAddImageAsParent(
|
||||||
session, 5 + base_image_id, 0, 28, 28, 1, 7, height, 4, 28,
|
session, 5 + base_image_id, 0, 28, 28, 1, 7, height, 4, 28,
|
||||||
height + 2); // bound_box_offset_x seems to be a bug
|
height + 2); // bound_box_offset_x seems to be a bug
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_2))
|
if (!(drawnCorners & FOOTPATH_CORNER_2))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 13 + base_image_id, 0, 0, 4, 4, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 13 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 28, 0, height + 2 });
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 7:
|
case 7:
|
||||||
PaintAddImageAsParent(session, 1 + base_image_id, 0, 4, 32, 1, 7, height, 0, 4, height + 2);
|
PaintAddImageAsParent(session, 1 + base_image_id, { 0, 4, height }, { 32, 1, 7 }, { 0, 4, height + 2 });
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_0))
|
if (!(drawnCorners & FOOTPATH_CORNER_0))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 11 + base_image_id, 0, 0, 4, 4, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 11 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 0, 28, height + 2 });
|
||||||
}
|
}
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_1))
|
if (!(drawnCorners & FOOTPATH_CORNER_1))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 12 + base_image_id, 0, 0, 4, 4, 7, height, 28, 28, height + 2);
|
PaintAddImageAsParent(session, 12 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 28, 28, height + 2 });
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 13:
|
case 13:
|
||||||
PaintAddImageAsParent(session, 1 + base_image_id, 0, 28, 32, 1, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 1 + base_image_id, { 0, 28, height }, { 32, 1, 7 }, { 0, 28, height + 2 });
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_2))
|
if (!(drawnCorners & FOOTPATH_CORNER_2))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 13 + base_image_id, 0, 0, 4, 4, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 13 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 28, 0, height + 2 });
|
||||||
}
|
}
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_3))
|
if (!(drawnCorners & FOOTPATH_CORNER_3))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 10 + base_image_id, 0, 0, 4, 4, 7, height, 0, 0, height + 2);
|
PaintAddImageAsParent(session, 10 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 0, 0, height + 2 });
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 14:
|
case 14:
|
||||||
PaintAddImageAsParent(session, 0 + base_image_id, 4, 0, 1, 32, 7, height, 4, 0, height + 2);
|
PaintAddImageAsParent(session, 0 + base_image_id, { 4, 0, height }, { 1, 32, 7 }, { 4, 0, height + 2 });
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_1))
|
if (!(drawnCorners & FOOTPATH_CORNER_1))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 12 + base_image_id, 0, 0, 4, 4, 7, height, 28, 28, height + 2);
|
PaintAddImageAsParent(session, 12 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 28, 28, height + 2 });
|
||||||
}
|
}
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_2))
|
if (!(drawnCorners & FOOTPATH_CORNER_2))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 13 + base_image_id, 0, 0, 4, 4, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 13 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 28, 0, height + 2 });
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 11:
|
case 11:
|
||||||
PaintAddImageAsParent(session, 0 + base_image_id, 28, 0, 1, 32, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 0 + base_image_id, { 28, 0, height }, { 1, 32, 7 }, { 28, 0, height + 2 });
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_0))
|
if (!(drawnCorners & FOOTPATH_CORNER_0))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 11 + base_image_id, 0, 0, 4, 4, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 11 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 0, 28, height + 2 });
|
||||||
}
|
}
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_3))
|
if (!(drawnCorners & FOOTPATH_CORNER_3))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 10 + base_image_id, 0, 0, 4, 4, 7, height, 0, 0, height + 2);
|
PaintAddImageAsParent(session, 10 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 0, 0, height + 2 });
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 15:
|
case 15:
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_0))
|
if (!(drawnCorners & FOOTPATH_CORNER_0))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 11 + base_image_id, 0, 0, 4, 4, 7, height, 0, 28, height + 2);
|
PaintAddImageAsParent(session, 11 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 0, 28, height + 2 });
|
||||||
}
|
}
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_1))
|
if (!(drawnCorners & FOOTPATH_CORNER_1))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 12 + base_image_id, 0, 0, 4, 4, 7, height, 28, 28, height + 2);
|
PaintAddImageAsParent(session, 12 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 28, 28, height + 2 });
|
||||||
}
|
}
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_2))
|
if (!(drawnCorners & FOOTPATH_CORNER_2))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 13 + base_image_id, 0, 0, 4, 4, 7, height, 28, 0, height + 2);
|
PaintAddImageAsParent(session, 13 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 28, 0, height + 2 });
|
||||||
}
|
}
|
||||||
if (!(drawnCorners & FOOTPATH_CORNER_3))
|
if (!(drawnCorners & FOOTPATH_CORNER_3))
|
||||||
{
|
{
|
||||||
PaintAddImageAsParent(session, 10 + base_image_id, 0, 0, 4, 4, 7, height, 0, 0, height + 2);
|
PaintAddImageAsParent(session, 10 + base_image_id, { 0, 0, height }, { 4, 4, 7 }, { 0, 0, height + 2 });
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -937,7 +937,7 @@ void path_paint(paint_session* session, uint16_t height, const TileElement* tile
|
||||||
uint32_t imageId = (SPR_HEIGHT_MARKER_BASE + heightMarkerBaseZ / 16) | COLOUR_GREY << 19 | IMAGE_TYPE_REMAP;
|
uint32_t imageId = (SPR_HEIGHT_MARKER_BASE + heightMarkerBaseZ / 16) | COLOUR_GREY << 19 | IMAGE_TYPE_REMAP;
|
||||||
imageId += get_height_marker_offset();
|
imageId += get_height_marker_offset();
|
||||||
imageId -= gMapBaseZ;
|
imageId -= gMapBaseZ;
|
||||||
PaintAddImageAsParent(session, imageId, 16, 16, 1, 1, 0, heightMarkerBaseZ);
|
PaintAddImageAsParent(session, imageId, { 16, 16, heightMarkerBaseZ }, { 1, 1, 0 });
|
||||||
}
|
}
|
||||||
|
|
||||||
PathSurfaceEntry* footpathEntry = tile_element->AsPath()->GetSurfaceEntry();
|
PathSurfaceEntry* footpathEntry = tile_element->AsPath()->GetSurfaceEntry();
|
||||||
|
|
Loading…
Reference in New Issue