mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +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

12
src/openrct2/entity/Particle.cpp
View File

@@ -162,8 +162,8 @@ void VehicleCrashParticle::Paint(paint_session& session, int32_t imageDirection)
}
uint32_t imageId = _VehicleCrashParticleSprites[crashed_sprite_base] + frame / 256;
imageId = imageId | (colour[0] << 19) | (colour[1] << 24) | IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS;
PaintAddImageAsParent(session, imageId, { 0, 0, z }, { 1, 1, 0 });
auto image = ImageId(imageId, colour[0], colour[1]);
PaintAddImageAsParent(session, image, { 0, 0, z }, { 1, 1, 0 });
}
/**
@@ -209,7 +209,7 @@ void CrashSplashParticle::Paint(paint_session& session, int32_t imageDirection)
// TODO: Create constant in sprites.h
uint32_t imageId = 22927 + (frame / 256);
PaintAddImageAsParent(session, imageId, { 0, 0, z }, { 1, 1, 0 });
PaintAddImageAsParent(session, ImageId(imageId), { 0, 0, z }, { 1, 1, 0 });
}
/**
@@ -268,7 +268,7 @@ void SteamParticle::Paint(paint_session& session, int32_t imageDirection) const
// TODO: Create constant in sprites.h
uint32_t imageId = 22637 + (frame / 256);
PaintAddImageAsParent(session, imageId, { 0, 0, z }, { 1, 1, 0 });
PaintAddImageAsParent(session, ImageId(imageId), { 0, 0, z }, { 1, 1, 0 });
}
/**
@@ -313,7 +313,7 @@ void ExplosionCloud::Paint(paint_session& session, int32_t imageDirection) const
PROFILED_FUNCTION();
uint32_t imageId = 22878 + (frame / 256);
PaintAddImageAsParent(session, imageId, { 0, 0, z }, { 1, 1, 0 });
PaintAddImageAsParent(session, ImageId(imageId), { 0, 0, z }, { 1, 1, 0 });
}
/**
@@ -359,5 +359,5 @@ void ExplosionFlare::Paint(paint_session& session, int32_t imageDirection) const
// TODO: Create constant in sprites.h
uint32_t imageId = 22896 + (frame / 256);
PaintAddImageAsParent(session, imageId, { 0, 0, z }, { 1, 1, 0 });
PaintAddImageAsParent(session, ImageId(imageId), { 0, 0, z }, { 1, 1, 0 });
}