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

Remove uint32_t overloads in Paint functions

Browse Source
This commit is contained in:
Gymnasiast
2022-09-29 00:00:49 +02:00
parent cedccf9b0e
commit a69a8fa7e8
21 changed files with 140 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/entity/Peep.cpp
View File

@@ -2798,7 +2798,7 @@ void Peep::Paint(paint_session& session, int32_t imageDirection) const
// In the following 4 calls to PaintAddImageAsParent/PaintAddImageAsChild, we add 5 (instead of 3) to the
// bound_box_offset_z to make sure peeps are drawn on top of railways
uint32_t baseImageId = (imageDirection >> 3) + GetPeepAnimation(SpriteType, actionSpriteType).base_image + imageOffset * 4;
uint32_t imageId = baseImageId | TshirtColour << 19 | TrousersColour << 24 | IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS;
auto imageId = ImageId(baseImageId, TshirtColour, TrousersColour);
PaintAddImageAsParent(session, imageId, { 0, 0, z }, { 1, 1, 11 }, { 0, 0, z + 5 });
auto* guest = As<Guest>();
@@ -2806,21 +2806,21 @@ void Peep::Paint(paint_session& session, int32_t imageDirection) const
{
if (baseImageId >= 10717 && baseImageId < 10749)
{
imageId = (baseImageId + 32) | guest->HatColour << 19 | IMAGE_TYPE_REMAP;
imageId = ImageId(baseImageId + 32, guest->HatColour);
PaintAddImageAsChild(session, imageId, { 0, 0, z }, { 1, 1, 11 }, { 0, 0, z + 5 });
return;
}
if (baseImageId >= 10781 && baseImageId < 10813)
{
imageId = (baseImageId + 32) | guest->BalloonColour << 19 | IMAGE_TYPE_REMAP;
imageId = ImageId(baseImageId + 32, guest->BalloonColour);
PaintAddImageAsChild(session, imageId, { 0, 0, z }, { 1, 1, 11 }, { 0, 0, z + 5 });
return;
}
if (baseImageId >= 11197 && baseImageId < 11229)
{
imageId = (baseImageId + 32) | guest->UmbrellaColour << 19 | IMAGE_TYPE_REMAP;
imageId = ImageId(baseImageId + 32, guest->UmbrellaColour);
PaintAddImageAsChild(session, imageId, { 0, 0, z }, { 1, 1, 11 }, { 0, 0, z + 5 });
return;
}