mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity

Use CoordsXY for rct_crooked_house_bound_box and correct arg passing

Browse Source
This commit is contained in:
ZehMatt
2021-08-20 23:18:00 +03:00
parent 3d90257dde
commit a5d2939108
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/openrct2/ride/gentle/CrookedHouse.cpp
View File

@@ -16,17 +16,15 @@
struct rct_crooked_house_bound_box
{
int16_t offset_x;
int16_t offset_y;
int16_t length_x;
int16_t length_y;
CoordsXY offset;
CoordsXY length;
};
static constexpr const rct_crooked_house_bound_box crooked_house_data[] = { { 6, 0, 42, 24 },
{ 0, 0, 0, 0 },
{ -16, -16, 32, 32 },
{ 0, 0, 0, 0 }, // Unused
{ 0, 6, 24, 42 } };
static constexpr const rct_crooked_house_bound_box crooked_house_data[] = { { { 6, 0 }, { 42, 24 } },
{ { 0, 0 }, { 0, 0 } },
{ { -16, -16 }, { 32, 32 } },
{ { 0, 0 }, { 0, 0 } }, // Unused
{ { 0, 6 }, { 24, 42 } } };
/**
* rct2: 0x0088ABA4
@@ -56,10 +54,9 @@ static void paint_crooked_house_structure(
uint32_t image_id = (direction + rideEntry->vehicles[0].base_image_id) | session->TrackColours[SCHEME_MISC];
rct_crooked_house_bound_box boundBox = crooked_house_data[segment];
const rct_crooked_house_bound_box& boundBox = crooked_house_data[segment];
PaintAddImageAsParent(
session, image_id, { x_offset, y_offset, height + 3 }, { boundBox.length_x, boundBox.length_y, 127 },
{ boundBox.offset_x, boundBox.offset_y, height + 3 });
session, image_id, { x_offset, y_offset, height + 3 }, { boundBox.length, 127 }, { boundBox.offset, height + 3 });
}
static void paint_crooked_house(