mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 07:43:01 +01:00
Code Issues Releases Wiki Activity

move array unk9A36C4 to kFreeroamVehicleMovementData

Browse Source
This commit is contained in:
Spacek531
2025-10-20 16:10:55 -07:00
committed by Gymnasiast
parent 2e4646a350
commit ea467ff723
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -380,23 +380,6 @@ static constexpr const int8_t* SwingingTimeToSpriteMaps[] = {
kSwingingTimeToSpriteMap8, kSwingingTimeToSpriteMap9, kSwingingTimeToSpriteMap10, kSwingingTimeToSpriteMap11, kSwingingTimeToSpriteMap8, kSwingingTimeToSpriteMap9, kSwingingTimeToSpriteMap10, kSwingingTimeToSpriteMap11,
}; };
struct Unk9A36C4Struct
{
int16_t x;
int16_t y;
uint32_t distance;
};
/** rct2: 0x009A36C4 */
static constexpr Unk9A36C4Struct kUnk9A36C4[] = {
{ -1, 0, 8716 }, { -1, 0, 8716 }, { -1, 0, 8716 }, { -1, 1, 12327 }, { -1, 1, 12327 }, { -1, 1, 12327 },
{ 0, 1, 8716 }, { -1, 1, 12327 }, { 0, 1, 8716 }, { 0, 1, 8716 }, { 0, 1, 8716 }, { 1, 1, 12327 },
{ 1, 1, 12327 }, { 1, 1, 12327 }, { 1, 0, 8716 }, { 1, 1, 12327 }, { 1, 0, 8716 }, { 1, 0, 8716 },
{ 1, 0, 8716 }, { 1, -1, 12327 }, { 1, -1, 12327 }, { 1, -1, 12327 }, { 0, -1, 8716 }, { 1, -1, 12327 },
{ 0, -1, 8716 }, { 0, -1, 8716 }, { 0, -1, 8716 }, { -1, -1, 12327 }, { -1, -1, 12327 }, { -1, -1, 12327 },
{ -1, 0, 8716 }, { -1, -1, 12327 },
};
/** rct2: 0x009A37C4 */ /** rct2: 0x009A37C4 */
static constexpr CoordsXY kSurroundingTiles[] = { static constexpr CoordsXY kSurroundingTiles[] = {
{ 0, 0 }, { 0, 0 },
@@ -3792,7 +3775,7 @@ void Vehicle::UpdateMotionBoatHire()
} }
int32_t edi = (Orientation | (var_35 & 1)) & 0x1F; int32_t edi = (Orientation | (var_35 & 1)) & 0x1F;
loc2 = { x + kUnk9A36C4[edi].x, y + kUnk9A36C4[edi].y }; loc2 = { x + Geometry::kFreeroamVehicleMovementData[edi].x, y + Geometry::kFreeroamVehicleMovementData[edi].y };
if (UpdateMotionCollisionDetection({ loc2, z }, nullptr)) if (UpdateMotionCollisionDetection({ loc2, z }, nullptr))
{ {
remaining_distance = 0; remaining_distance = 0;
@@ -3890,7 +3873,7 @@ void Vehicle::UpdateMotionBoatHire()
TrackLocation = { flooredLocation, TrackLocation.z }; TrackLocation = { flooredLocation, TrackLocation.z };
} }
remaining_distance -= kUnk9A36C4[edi].distance; remaining_distance -= Geometry::kFreeroamVehicleMovementData[edi].distance;
_vehicleCurPosition.x = loc2.x; _vehicleCurPosition.x = loc2.x;
_vehicleCurPosition.y = loc2.y; _vehicleCurPosition.y = loc2.y;
if (remaining_distance < 0x368A) if (remaining_distance < 0x368A)
@@ -5229,10 +5212,10 @@ int32_t Vehicle::UpdateMotionDodgems()
CoordsXYZ location = { x, y, z }; CoordsXYZ location = { x, y, z };
location.x += kUnk9A36C4[oldCollisionDirection].x; location.x += Geometry::kFreeroamVehicleMovementData[oldCollisionDirection].x;
location.y += kUnk9A36C4[oldCollisionDirection].y; location.y += Geometry::kFreeroamVehicleMovementData[oldCollisionDirection].y;
location.x += kUnk9A36C4[oldCollisionDirection + 1].x; location.x += Geometry::kFreeroamVehicleMovementData[oldCollisionDirection + 1].x;
location.y += kUnk9A36C4[oldCollisionDirection + 1].y; location.y += Geometry::kFreeroamVehicleMovementData[oldCollisionDirection + 1].y;
if (collideSprite = DodgemsCarWouldCollideAt(location); !collideSprite.has_value()) if (collideSprite = DodgemsCarWouldCollideAt(location); !collideSprite.has_value())
{ {
@@ -5256,15 +5239,15 @@ int32_t Vehicle::UpdateMotionDodgems()
direction |= var_35 & 1; direction |= var_35 & 1;
CoordsXY location = _vehicleCurPosition; CoordsXY location = _vehicleCurPosition;
location.x += kUnk9A36C4[direction].x; location.x += Geometry::kFreeroamVehicleMovementData[direction].x;
location.y += kUnk9A36C4[direction].y; location.y += Geometry::kFreeroamVehicleMovementData[direction].y;
if (collideSprite = DodgemsCarWouldCollideAt(location); collideSprite.has_value()) if (collideSprite = DodgemsCarWouldCollideAt(location); collideSprite.has_value())
{ {
break; break;
} }
remaining_distance -= kUnk9A36C4[direction].distance; remaining_distance -= Geometry::kFreeroamVehicleMovementData[direction].distance;
_vehicleCurPosition.x = location.x; _vehicleCurPosition.x = location.x;
_vehicleCurPosition.y = location.y; _vehicleCurPosition.y = location.y;
if (remaining_distance < 13962) if (remaining_distance < 13962)

11
src/openrct2/ride/VehicleGeometry.cpp
View File

@@ -38,4 +38,15 @@ namespace OpenRCT2::RideVehicle::Geometry
}); });
static_assert(std::size(kSubpositionTranslationDistances) == 16); static_assert(std::size(kSubpositionTranslationDistances) == 16);
/** rct2: 0x009A36C4 */
constexpr auto kFreeroamVehicleMovementData = std::to_array<Unk9A36C4Struct>( {
{ -1, 0, 8716 }, { -1, 0, 8716 }, { -1, 0, 8716 }, { -1, 1, 12327 }, { -1, 1, 12327 }, { -1, 1, 12327 },
{ 0, 1, 8716 }, { -1, 1, 12327 }, { 0, 1, 8716 }, { 0, 1, 8716 }, { 0, 1, 8716 }, { 1, 1, 12327 },
{ 1, 1, 12327 }, { 1, 1, 12327 }, { 1, 0, 8716 }, { 1, 1, 12327 }, { 1, 0, 8716 }, { 1, 0, 8716 },
{ 1, 0, 8716 }, { 1, -1, 12327 }, { 1, -1, 12327 }, { 1, -1, 12327 }, { 0, -1, 8716 }, { 1, -1, 12327 },
{ 0, -1, 8716 }, { 0, -1, 8716 }, { 0, -1, 8716 }, { -1, -1, 12327 }, { -1, -1, 12327 }, { -1, -1, 12327 },
{ -1, 0, 8716 }, { -1, -1, 12327 },
});
static_assert(std::size(kFreeroamVehicleMovementData) == 32);
} // namespace OpenRCT2::RideVehicle::Geometry } // namespace OpenRCT2::RideVehicle::Geometry

9
src/openrct2/ride/VehicleGeometry.h
View File

@@ -17,7 +17,16 @@
namespace OpenRCT2::RideVehicle::Geometry namespace OpenRCT2::RideVehicle::Geometry
{ {
struct Unk9A36C4Struct
{
int16_t x;
int16_t y;
uint32_t distance;
};
extern const std::array<int32_t, 16> kSubpositionTranslationDistances; extern const std::array<int32_t, 16> kSubpositionTranslationDistances;
extern const std::array<Unk9A36C4Struct, 32> kFreeroamVehicleMovementData;
/** The distance between subposition points in a movement vector. /** The distance between subposition points in a movement vector.
* Squashes vector components to 0 or !0, so vector length is ignored. * Squashes vector components to 0 or !0, so vector length is ignored.