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

Refactor CarEntrySetImageMaxSizes to use constants (#23234)

Browse Source 
* Use designated initialisers in CarEntrySetImageMaxSizes

* Add named constants to CarEntrySetImageMaxSizes
This commit is contained in:
Aaron van Geffen
2024-11-20 16:25:59 +09:00
committed by GitHub
parent 4f93448606
commit 290b39ade2
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/openrct2/ride/CarEntry.cpp
View File

@@ -46,28 +46,34 @@ uint32_t CarEntry::SpriteOffset(SpriteGroupType spriteGroup, int32_t imageDirect
*/
void CarEntrySetImageMaxSizes(CarEntry& carEntry, int32_t numImages)
{
uint8_t bitmap[200][200] = { 0 };
constexpr uint8_t kWidth = 200;
constexpr uint8_t kHeight = 200;
constexpr uint8_t kCentreX = kWidth / 2;
constexpr uint8_t kCentreY = kHeight / 2;
uint8_t bitmap[kHeight][kWidth] = { 0 };
DrawPixelInfo dpi = {
/*.bits = */ reinterpret_cast<uint8_t*>(bitmap),
/*.x = */ -100,
/*.y = */ -100,
/*.width = */ 200,
/*.height = */ 200,
/*.pitch = */ 0,
/*.zoom_level = */ ZoomLevel{ 0 },
.bits = reinterpret_cast<uint8_t*>(bitmap),
.x = -(kWidth / 2),
.y = -(kHeight / 2),
.width = kWidth,
.height = kHeight,
.pitch = 0,
.zoom_level = ZoomLevel{ 0 },
};
for (int32_t i = 0; i < numImages; ++i)
{
GfxDrawSpriteSoftware(dpi, ImageId(carEntry.base_image_id + i), { 0, 0 });
}
int32_t spriteWidth = -1;
for (int32_t i = 99; i != 0; --i)
for (int32_t i = kCentreX - 1; i != 0; --i)
{
for (int32_t j = 0; j < 200; j++)
for (int32_t j = 0; j < kWidth; j++)
{
if (bitmap[j][100 - i] != 0)
if (bitmap[j][kCentreX - i] != 0)
{
spriteWidth = i;
break;
@@ -77,9 +83,9 @@ void CarEntrySetImageMaxSizes(CarEntry& carEntry, int32_t numImages)
if (spriteWidth != -1)
break;
for (int32_t j = 0; j < 200; j++)
for (int32_t j = 0; j < kWidth; j++)
{
if (bitmap[j][100 + i] != 0)
if (bitmap[j][kCentreX + i] != 0)
{
spriteWidth = i;
break;
@@ -89,15 +95,14 @@ void CarEntrySetImageMaxSizes(CarEntry& carEntry, int32_t numImages)
if (spriteWidth != -1)
break;
}
spriteWidth++;
int32_t spriteHeightNegative = -1;
for (int32_t i = 99; i != 0; --i)
int32_t spriteHeightNegative = -1;
for (int32_t i = kCentreY - 1; i != 0; --i)
{
for (int32_t j = 0; j < 200; j++)
for (int32_t j = 0; j < kWidth; j++)
{
if (bitmap[100 - i][j] != 0)
if (bitmap[kCentreY - i][j] != 0)
{
spriteHeightNegative = i;
break;
@@ -110,12 +115,11 @@ void CarEntrySetImageMaxSizes(CarEntry& carEntry, int32_t numImages)
spriteHeightNegative++;
int32_t spriteHeightPositive = -1;
for (int32_t i = 99; i != 0; --i)
for (int32_t i = kCentreY - 1; i != 0; --i)
{
for (int32_t j = 0; j < 200; j++)
for (int32_t j = 0; j < kWidth; j++)
{
if (bitmap[100 + i][j] != 0)
if (bitmap[kCentreY + i][j] != 0)
{
spriteHeightPositive = i;
break;