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

Rename additional_animation to animation as it makes more sense

Browse Source 
Label all vehicle animation types based on loading relevant parks
This commit is contained in:
duncanspumpkin
2018-01-17 21:05:19 +00:00
committed by Duncan
parent 00a9ab1b17
commit addf087918
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -381,7 +381,7 @@ void RideObject::ReadLegacyVehicle(IReadObjectContext * context, IStream * strea
vehicle->sprite_width = stream->ReadValue<uint8>();
vehicle->sprite_height_negative = stream->ReadValue<uint8>();
vehicle->sprite_height_positive = stream->ReadValue<uint8>();
vehicle->additional_animation = stream->ReadValue<uint8>();
vehicle->animation = stream->ReadValue<uint8>();
vehicle->flags = stream->ReadValue<uint32>();
vehicle->base_num_frames = stream->ReadValue<uint16>();
stream->Seek(4, STREAM_SEEK_CURRENT);
@@ -475,7 +475,7 @@ uint8 RideObject::CalculateNumVerticalFrames(const rct_ride_entry_vehicle * vehi
{
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SPINNING_ADDITIONAL_FRAMES))
{
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_23 && vehicleEntry->additional_animation != VEHICLE_ENTRY_ADDITIONAL_ANIMATION_6)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_23 && vehicleEntry->animation != VEHICLE_ENTRY_ANIMATION_OBSERVATION_TOWER)
{
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_DODGEM_INUSE_LIGHTS))
{