mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename previously unknown vehicle flags, and json strings to camelCase

This commit is contained in:
Basssiiie 2021-05-13 13:34:32 +02:00 committed by GitHub
parent 816bf827ab
commit 5480c99e0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 86 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contributors.md
View File

@ -91,6 +91,7 @@ The following people are not part of the development team, but have been contrib
* Jim Verheijde (Jimver) - Make handymen less likely to get stuck in queue lines, misc.
* Helio Batimarqui (batimarqui) - Misc.
* Keith Stellyes (keithstellyes) - Misc.
* Bas Cantrijn (Basssiiie) - Misc.
## Bug fixes
* (halfbro)

7
src/openrct2-ui/windows/Ride.cpp
View File

@ -1046,7 +1046,7 @@ static void window_ride_draw_tab_vehicle(rct_drawpixelinfo* dpi, rct_window* w)
int32_t spriteIndex = 32;
if (w->page == WINDOW_RIDE_PAGE_VEHICLE)
spriteIndex += w->frame_no;
spriteIndex /= (rideVehicleEntry->flags & VEHICLE_ENTRY_FLAG_11) ? 4 : 2;
spriteIndex /= (rideVehicleEntry->flags & VEHICLE_ENTRY_FLAG_USE_16_ROTATION_FRAMES) ? 4 : 2;
spriteIndex &= rideVehicleEntry->rotation_frame_mask;
spriteIndex *= rideVehicleEntry->base_num_frames;
spriteIndex += rideVehicleEntry->base_image_id;
@ -3023,7 +3023,7 @@ static void window_ride_vehicle_scrollpaint(rct_window* w, rct_drawpixelinfo* dp
vehicle_colour vehicleColour = ride_get_vehicle_colour(ride, vehicleColourIndex);
int32_t spriteIndex = 16;
if (rideVehicleEntry->flags & VEHICLE_ENTRY_FLAG_11)
if (rideVehicleEntry->flags & VEHICLE_ENTRY_FLAG_USE_16_ROTATION_FRAMES)
spriteIndex /= 2;
spriteIndex &= rideVehicleEntry->rotation_frame_mask;
@ -4887,7 +4887,8 @@ static void window_ride_colour_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi
screenCoords.y += rideVehicleEntry->tab_height;
// Draw the coloured spinning vehicle
uint32_t spriteIndex = (rideVehicleEntry->flags & VEHICLE_ENTRY_FLAG_11) ? w->frame_no / 4 : w->frame_no / 2;
uint32_t spriteIndex = (rideVehicleEntry->flags & VEHICLE_ENTRY_FLAG_USE_16_ROTATION_FRAMES) ? w->frame_no / 4
: w->frame_no / 2;
spriteIndex &= rideVehicleEntry->rotation_frame_mask;
spriteIndex *= rideVehicleEntry->base_num_frames;
spriteIndex += rideVehicleEntry->base_image_id;

66
src/openrct2/object/RideObject.cpp
View File

@ -216,9 +216,9 @@ void RideObject::Load()
{
int32_t b = vehicleEntry->base_num_frames * 32;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_11)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_USE_16_ROTATION_FRAMES)
b /= 2;
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_15)
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_USE_4_ROTATION_FRAMES)
b /= 8;
image_index += b;
@ -338,10 +338,10 @@ void RideObject::Load()
cur_vehicle_images_offset = image_index + vehicleEntry->no_seating_rows * vehicleEntry->no_vehicle_images;
// 0x6DEB0D
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_10))
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_RECALCULATE_SPRITE_BOUNDS))
{
int32_t num_images = cur_vehicle_images_offset - vehicleEntry->base_image_id;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_13)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SPRITE_BOUNDS_INCLUDE_INVERTED_SET)
{
num_images *= 2;
}
@ -497,9 +497,10 @@ uint8_t RideObject::CalculateNumHorizontalFrames(const rct_ride_entry_vehicle* v
uint8_t numHorizontalFrames;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SWINGING)
{
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_21) && !(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SLIDE_SWING))
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SUSPENDED_SWING)
&& !(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SLIDE_SWING))
{
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_25)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING)
{
numHorizontalFrames = 3;
}
@ -508,7 +509,9 @@ uint8_t RideObject::CalculateNumHorizontalFrames(const rct_ride_entry_vehicle* v
numHorizontalFrames = 5;
}
}
else if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_21) || !(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SLIDE_SWING))
else if (
!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SUSPENDED_SWING)
|| !(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SLIDE_SWING))
{
numHorizontalFrames = 7;
}
@ -805,27 +808,58 @@ rct_ride_entry_vehicle RideObject::ReadJsonCar(json_t& jCar)
{ "corkscrews", VEHICLE_SPRITE_FLAG_CORKSCREWS },
{ "restraintAnimation", VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION },
{ "curvedLiftHill", VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL },
{ "VEHICLE_SPRITE_FLAG_15", VEHICLE_SPRITE_FLAG_15 },
{ "VEHICLE_SPRITE_FLAG_15", VEHICLE_SPRITE_FLAG_USE_4_ROTATION_FRAMES },
});
}
car.flags |= Json::GetFlags<uint32_t>(
jCar,
{
{ "isPoweredRideWithUnrestrictedGravity", VEHICLE_ENTRY_FLAG_POWERED_RIDE_UNRESTRICTED_GRAVITY },
{ "hasNoUpstopWheels", VEHICLE_ENTRY_FLAG_NO_UPSTOP_WHEELS },
{ "hasNoUpstopWheelsBobsleigh", VEHICLE_ENTRY_FLAG_NO_UPSTOP_BOBSLEIGH },
{ "isMiniGolf", VEHICLE_ENTRY_FLAG_MINI_GOLF },
{ "isReverserBogie", VEHICLE_ENTRY_FLAG_REVERSER_BOGIE },
{ "isReverserPassengerCar", VEHICLE_ENTRY_FLAG_REVERSER_PASSENGER_CAR },
{ "hasInvertedSpriteSet", VEHICLE_ENTRY_FLAG_HAS_INVERTED_SPRITE_SET },
{ "hasDodgemInUseLights", VEHICLE_ENTRY_FLAG_DODGEM_INUSE_LIGHTS },
{ "hasAdditionalColour2", VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_2 },
{ "recalculateSpriteBounds", VEHICLE_ENTRY_FLAG_RECALCULATE_SPRITE_BOUNDS },
{ "VEHICLE_ENTRY_FLAG_11", VEHICLE_ENTRY_FLAG_USE_16_ROTATION_FRAMES },
{ "overrideNumberOfVerticalFrames", VEHICLE_ENTRY_FLAG_OVERRIDE_NUM_VERTICAL_FRAMES },
{ "spriteBoundsIncludeInvertedSet", VEHICLE_ENTRY_FLAG_SPRITE_BOUNDS_INCLUDE_INVERTED_SET },
{ "hasAdditionalSpinningFrames", VEHICLE_ENTRY_FLAG_SPINNING_ADDITIONAL_FRAMES },
{ "isLift", VEHICLE_ENTRY_FLAG_LIFT },
{ "hasAdditionalColour1", VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_1 },
{ "hasSwinging", VEHICLE_ENTRY_FLAG_SWINGING },
{ "hasSpinning", VEHICLE_ENTRY_FLAG_SPINNING },
{ "isPowered", VEHICLE_ENTRY_FLAG_POWERED },
{ "hasScreamingRiders", VEHICLE_ENTRY_FLAG_RIDERS_SCREAM },
{ "useSuspendedSwing", VEHICLE_ENTRY_FLAG_SUSPENDED_SWING },
{ "useBoatHireCollisionDetection", VEHICLE_ENTRY_FLAG_BOAT_HIRE_COLLISION_DETECTION },
{ "hasVehicleAnimation", VEHICLE_ENTRY_FLAG_VEHICLE_ANIMATION },
{ "hasRiderAnimation", VEHICLE_ENTRY_FLAG_RIDER_ANIMATION },
{ "useWoodenWildMouseSwing", VEHICLE_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING },
{ "useSlideSwing", VEHICLE_ENTRY_FLAG_SLIDE_SWING },
{ "isChairlift", VEHICLE_ENTRY_FLAG_CHAIRLIFT },
{ "isWaterRide", VEHICLE_ENTRY_FLAG_WATER_RIDE },
{ "isGoKart", VEHICLE_ENTRY_FLAG_GO_KART },
{ "useDodgemCarPlacement", VEHICLE_ENTRY_FLAG_DODGEM_CAR_PLACEMENT },
// Obsolete flags that have been replaced with named and camelCased values, but kept for now for backward
// compatibility.
{ "VEHICLE_ENTRY_FLAG_POWERED_RIDE_UNRESTRICTED_GRAVITY", VEHICLE_ENTRY_FLAG_POWERED_RIDE_UNRESTRICTED_GRAVITY },
{ "VEHICLE_ENTRY_FLAG_NO_UPSTOP_WHEELS", VEHICLE_ENTRY_FLAG_NO_UPSTOP_WHEELS },
{ "VEHICLE_ENTRY_FLAG_NO_UPSTOP_BOBSLEIGH", VEHICLE_ENTRY_FLAG_NO_UPSTOP_BOBSLEIGH },
{ "VEHICLE_ENTRY_FLAG_MINI_GOLF", VEHICLE_ENTRY_FLAG_MINI_GOLF },
{ "VEHICLE_ENTRY_FLAG_4", VEHICLE_ENTRY_FLAG_4 },
{ "VEHICLE_ENTRY_FLAG_5", VEHICLE_ENTRY_FLAG_5 },
{ "VEHICLE_ENTRY_FLAG_4", VEHICLE_ENTRY_FLAG_REVERSER_BOGIE },
{ "VEHICLE_ENTRY_FLAG_5", VEHICLE_ENTRY_FLAG_REVERSER_PASSENGER_CAR },
{ "VEHICLE_ENTRY_FLAG_HAS_INVERTED_SPRITE_SET", VEHICLE_ENTRY_FLAG_HAS_INVERTED_SPRITE_SET },
{ "VEHICLE_ENTRY_FLAG_DODGEM_INUSE_LIGHTS", VEHICLE_ENTRY_FLAG_DODGEM_INUSE_LIGHTS },
{ "VEHICLE_ENTRY_FLAG_ALLOW_DOORS_DEPRECATED", VEHICLE_ENTRY_FLAG_ALLOW_DOORS_DEPRECATED },
{ "VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_2", VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_2 },
{ "VEHICLE_ENTRY_FLAG_10", VEHICLE_ENTRY_FLAG_10 },
{ "VEHICLE_ENTRY_FLAG_11", VEHICLE_ENTRY_FLAG_11 },
{ "VEHICLE_ENTRY_FLAG_10", VEHICLE_ENTRY_FLAG_RECALCULATE_SPRITE_BOUNDS },
{ "VEHICLE_ENTRY_FLAG_OVERRIDE_NUM_VERTICAL_FRAMES", VEHICLE_ENTRY_FLAG_OVERRIDE_NUM_VERTICAL_FRAMES },
{ "VEHICLE_ENTRY_FLAG_13", VEHICLE_ENTRY_FLAG_13 },
{ "VEHICLE_ENTRY_FLAG_13", VEHICLE_ENTRY_FLAG_SPRITE_BOUNDS_INCLUDE_INVERTED_SET },
{ "VEHICLE_ENTRY_FLAG_SPINNING_ADDITIONAL_FRAMES", VEHICLE_ENTRY_FLAG_SPINNING_ADDITIONAL_FRAMES },
{ "VEHICLE_ENTRY_FLAG_LIFT", VEHICLE_ENTRY_FLAG_LIFT },
{ "VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_1", VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_1 },
@ -833,11 +867,11 @@ rct_ride_entry_vehicle RideObject::ReadJsonCar(json_t& jCar)
{ "VEHICLE_ENTRY_FLAG_SPINNING", VEHICLE_ENTRY_FLAG_SPINNING },
{ "VEHICLE_ENTRY_FLAG_POWERED", VEHICLE_ENTRY_FLAG_POWERED },
{ "VEHICLE_ENTRY_FLAG_RIDERS_SCREAM", VEHICLE_ENTRY_FLAG_RIDERS_SCREAM },
{ "VEHICLE_ENTRY_FLAG_21", VEHICLE_ENTRY_FLAG_21 },
{ "VEHICLE_ENTRY_FLAG_21", VEHICLE_ENTRY_FLAG_SUSPENDED_SWING },
{ "VEHICLE_ENTRY_FLAG_BOAT_HIRE_COLLISION_DETECTION", VEHICLE_ENTRY_FLAG_BOAT_HIRE_COLLISION_DETECTION },
{ "VEHICLE_ENTRY_FLAG_VEHICLE_ANIMATION", VEHICLE_ENTRY_FLAG_VEHICLE_ANIMATION },
{ "VEHICLE_ENTRY_FLAG_RIDER_ANIMATION", VEHICLE_ENTRY_FLAG_RIDER_ANIMATION },
{ "VEHICLE_ENTRY_FLAG_25", VEHICLE_ENTRY_FLAG_25 },
{ "VEHICLE_ENTRY_FLAG_25", VEHICLE_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING },
{ "VEHICLE_ENTRY_FLAG_SLIDE_SWING", VEHICLE_ENTRY_FLAG_SLIDE_SWING },
{ "VEHICLE_ENTRY_FLAG_CHAIRLIFT", VEHICLE_ENTRY_FLAG_CHAIRLIFT },
{ "VEHICLE_ENTRY_FLAG_WATER_RIDE", VEHICLE_ENTRY_FLAG_WATER_RIDE },

6
src/openrct2/ride/Ride.cpp
View File

@ -4199,14 +4199,14 @@ static Vehicle* vehicle_create_car(
vehicle->mini_golf_current_animation = 0;
vehicle->mini_golf_flags = 0;
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_4)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_REVERSER_BOGIE)
{
if (vehicle->IsHead())
{
subposition = VehicleTrackSubposition::ReverserRCFrontBogie;
}
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_5)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_REVERSER_PASSENGER_CAR)
{
subposition = VehicleTrackSubposition::ReverserRCRearBogie;
}
@ -5705,7 +5705,7 @@ void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int3
// Moved from object paint
if (vehicle_type->flags & VEHICLE_ENTRY_FLAG_13)
if (vehicle_type->flags & VEHICLE_ENTRY_FLAG_SPRITE_BOUNDS_INCLUDE_INVERTED_SET)
{
bl += 16;
}

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

@ -6999,11 +6999,11 @@ void Vehicle::UpdateSwingingCar()
return;
}
int16_t dx = 3185;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_21)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SUSPENDED_SWING)
{
dx = 5006;
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_25)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING)
{
dx = 1820;
}
@ -8329,7 +8329,7 @@ loc_6DAEB9:
moveInfovehicleSpriteType = moveInfo->Pitch;
if ((vehicleEntry->flags & VEHICLE_ENTRY_FLAG_25) && moveInfo->Pitch != 0)
if ((vehicleEntry->flags & VEHICLE_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING) && moveInfo->Pitch != 0)
{
SwingSprite = 0;
SwingPosition = 0;
@ -8638,7 +8638,7 @@ loc_6DBA33:;
Pitch = moveInfo->Pitch;
moveInfoVehicleSpriteType = moveInfo->Pitch;
if ((vehicleEntry->flags & VEHICLE_ENTRY_FLAG_25) && Pitch != 0)
if ((vehicleEntry->flags & VEHICLE_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING) && Pitch != 0)
{
SwingSprite = 0;
SwingPosition = 0;
@ -8991,7 +8991,7 @@ loc_6DC743:
bank_rotation = moveInfo->bank_rotation;
Pitch = moveInfo->Pitch;
if (rideEntry->vehicles[0].flags & VEHICLE_ENTRY_FLAG_25)
if (rideEntry->vehicles[0].flags & VEHICLE_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING)
{
if (Pitch != 0)
{
@ -9107,7 +9107,7 @@ loc_6DCC2C:
bank_rotation = moveInfo->bank_rotation;
Pitch = moveInfo->Pitch;
if (rideEntry->vehicles[0].flags & VEHICLE_ENTRY_FLAG_25)
if (rideEntry->vehicles[0].flags & VEHICLE_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING)
{
if (Pitch != 0)
{

31
src/openrct2/ride/Vehicle.h
View File

@ -375,24 +375,27 @@ struct train_ref
enum : uint32_t
{
VEHICLE_ENTRY_FLAG_POWERED_RIDE_UNRESTRICTED_GRAVITY = 1
<< 0, // Set on powered vehicles that do not slow down when going down a hill
<< 0, // Set on powered vehicles that do not slow down when going down a hill.
VEHICLE_ENTRY_FLAG_NO_UPSTOP_WHEELS = 1 << 1,
VEHICLE_ENTRY_FLAG_NO_UPSTOP_BOBSLEIGH = 1 << 2,
VEHICLE_ENTRY_FLAG_MINI_GOLF = 1 << 3,
VEHICLE_ENTRY_FLAG_4 = 1 << 4,
VEHICLE_ENTRY_FLAG_5 = 1 << 5,
VEHICLE_ENTRY_FLAG_REVERSER_BOGIE = 1 << 4,
VEHICLE_ENTRY_FLAG_REVERSER_PASSENGER_CAR = 1 << 5,
VEHICLE_ENTRY_FLAG_HAS_INVERTED_SPRITE_SET = 1 << 6, // Set on vehicles that support running inverted for extended periods
// of time, i.e. the Flying, Lay-down and Multi-dimension RCs.
VEHICLE_ENTRY_FLAG_DODGEM_INUSE_LIGHTS = 1
<< 7, // When set the vehicle has an additional frame for when in use. Used only by dodgems.
VEHICLE_ENTRY_FLAG_ALLOW_DOORS_DEPRECATED = 1 << 8, // Not used any more - every vehicle will now work with doors
VEHICLE_ENTRY_FLAG_ALLOW_DOORS_DEPRECATED = 1 << 8, // Not used any more - every vehicle will now work with doors.
VEHICLE_ENTRY_FLAG_ENABLE_ADDITIONAL_COLOUR_2 = 1 << 9,
VEHICLE_ENTRY_FLAG_10 = 1 << 10,
VEHICLE_ENTRY_FLAG_11 = 1 << 11,
VEHICLE_ENTRY_FLAG_RECALCULATE_SPRITE_BOUNDS = 1 << 10, // Only used during loading of the objects.
VEHICLE_ENTRY_FLAG_USE_16_ROTATION_FRAMES = 1
<< 11, // Instead of the default 32 rotation frames. Only used for boat hire and works only for non sloped sprites.
VEHICLE_ENTRY_FLAG_OVERRIDE_NUM_VERTICAL_FRAMES = 1
<< 12, // Setting this will cause the game to set vehicleEntry->num_vertical_frames to
// vehicleEntry->num_vertical_frames_override, rather than determining it itself.
VEHICLE_ENTRY_FLAG_13 = 1 << 13,
VEHICLE_ENTRY_FLAG_SPRITE_BOUNDS_INCLUDE_INVERTED_SET = 1
<< 13, // Used together with HAS_INVERTED_SPRITE_SET and RECALCULATE_SPRITE_BOUNDS and includes the inverted sprites
// into the function that recalculates the sprite bounds.
VEHICLE_ENTRY_FLAG_SPINNING_ADDITIONAL_FRAMES = 1
<< 14, // 16x additional frames for vehicle. A spinning item with additional frames must always face forward to
// load/unload. Spinning without can load/unload at 4 rotations.
@ -402,18 +405,19 @@ enum : uint32_t
VEHICLE_ENTRY_FLAG_SPINNING = 1 << 18,
VEHICLE_ENTRY_FLAG_POWERED = 1 << 19,
VEHICLE_ENTRY_FLAG_RIDERS_SCREAM = 1 << 20,
VEHICLE_ENTRY_FLAG_21 = 1 << 21, // Swinging coaster??
VEHICLE_ENTRY_FLAG_SUSPENDED_SWING = 1 << 21, // Suspended swinging coaster, or bobsleigh if SLIDE_SWING is also enabled.
VEHICLE_ENTRY_FLAG_BOAT_HIRE_COLLISION_DETECTION = 1 << 22,
VEHICLE_ENTRY_FLAG_VEHICLE_ANIMATION = 1 << 23, // Set on animated vehicles like the Multi-dimension coaster trains,
// Miniature Railway locomotives and Helicycles.
VEHICLE_ENTRY_FLAG_RIDER_ANIMATION = 1 << 24, // Set when the animation updates rider sprite positions
VEHICLE_ENTRY_FLAG_25 = 1 << 25,
VEHICLE_ENTRY_FLAG_RIDER_ANIMATION = 1 << 24, // Set when the animation updates rider sprite positions.
VEHICLE_ENTRY_FLAG_WOODEN_WILD_MOUSE_SWING = 1 << 25,
VEHICLE_ENTRY_FLAG_LOADING_WAYPOINTS = 1
<< 26, // Peep loading positions have x and y coordinates. Normal rides just have offsets
<< 26, // Peep loading positions have x and y coordinates. Normal rides just have offsets.
VEHICLE_ENTRY_FLAG_SLIDE_SWING = 1
<< 27, // Set on dingy slides. They have there own swing value calculations and have a different amount of images.
// Also set on bobsleighs together with the SUSPENDED_SWING flag.
VEHICLE_ENTRY_FLAG_CHAIRLIFT = 1 << 28,
VEHICLE_ENTRY_FLAG_WATER_RIDE = 1 << 29, // Set on rides where water would provide continuous propulsion
VEHICLE_ENTRY_FLAG_WATER_RIDE = 1 << 29, // Set on rides where water would provide continuous propulsion.
VEHICLE_ENTRY_FLAG_GO_KART = 1 << 30,
VEHICLE_ENTRY_FLAG_DODGEM_CAR_PLACEMENT = 1u << 31,
};
@ -470,7 +474,8 @@ enum : uint32_t
VEHICLE_SPRITE_FLAG_CORKSCREWS = (1 << 12),
VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION = (1 << 13),
VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL = (1 << 14),
VEHICLE_SPRITE_FLAG_15 = (1 << 15),
// Used only on lifts (the transport ride), to only use 4 rotation sprites instead of 32.
VEHICLE_SPRITE_FLAG_USE_4_ROTATION_FRAMES = (1 << 15),
};
enum

4
src/openrct2/ride/VehiclePaint.cpp
View File

@ -967,11 +967,11 @@ static void vehicle_sprite_paint_6D51EB(
paint_session* session, const Vehicle* vehicle, int32_t ebx, int32_t z, const rct_ride_entry_vehicle* vehicleEntry)
{
int32_t ecx = ebx / 2;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_11)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_USE_16_ROTATION_FRAMES)
{
ebx = ebx / 2;
}
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_15)
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_USE_4_ROTATION_FRAMES)
{
ebx = ebx / 8;
}

4
src/openrct2/ride/water/SubmarineRide.cpp
View File

@ -45,11 +45,11 @@ void vehicle_visual_submarine(
}
else
{
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_11)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_USE_16_ROTATION_FRAMES)
{
baseImage_id /= 2;
}
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_15)
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_USE_4_ROTATION_FRAMES)
{
baseImage_id /= 8;
}