mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Replace some usages of LocationXY(Z)16 (#10699)

Browse Source
This commit is contained in:
Michael Steenbeek
2020-02-18 22:42:38 +01:00
committed by GitHub
parent a8b5304786
commit f41f878581
11 changed files with 83 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/ride/Vehicle.cpp
View File

@@ -3585,7 +3585,7 @@ static void vehicle_update_collision_setup(Vehicle* vehicle)
}
/** rct2: 0x009A3AC4, 0x009A3AC6 */
static constexpr const LocationXY16 stru_9A3AC4[] = {
static constexpr const CoordsXY stru_9A3AC4[] = {
{ -256, 0 }, { -236, 98 }, { -181, 181 }, { -98, 236 }, { 0, 256 }, { 98, 236 }, { 181, 181 }, { 236, 98 },
{ 256, 0 }, { 236, -98 }, { 181, -181 }, { 98, -236 }, { 0, -256 }, { -98, -236 }, { -181, -181 }, { -236, -98 },
};
@@ -3622,23 +3622,23 @@ static void vehicle_update_crash_setup(Vehicle* vehicle)
trainVehicle->sub_state = 0;
int32_t x = stru_9A3AC4[trainVehicle->sprite_direction / 2].x;
int32_t y = stru_9A3AC4[trainVehicle->sprite_direction / 2].y;
auto z = Unk9A38D4[trainVehicle->vehicle_sprite_type] >> 23;
int32_t ecx = Unk9A37E4[trainVehicle->vehicle_sprite_type] >> 15;
x *= ecx;
y *= ecx;
x >>= 16;
y >>= 16;
ecx = Unk9A38D4[trainVehicle->vehicle_sprite_type] >> 23;
x *= edx;
y *= edx;
ecx *= edx;
z *= edx;
x >>= 8;
y >>= 8;
ecx >>= 8;
z >>= 8;
trainVehicle->crash_x = x;
trainVehicle->crash_y = y;
trainVehicle->crash_z = ecx;
trainVehicle->crash_z = z;
trainVehicle->crash_x += (scenario_rand() & 0xF) - 8;
trainVehicle->crash_y += (scenario_rand() & 0xF) - 8;
trainVehicle->crash_z += (scenario_rand() & 0xF) - 8;