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

Rename additional_animation to animation as it makes more sense 

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
Show Stats 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))
{

2
src/openrct2/ride/RideData.cpp
View File

@ -1598,7 +1598,7 @@ const rct_ride_entry_vehicle CableLiftVehicle = {
/* .sprite_width = */ 0,
/* .sprite_height_negative = */ 0,
/* .sprite_height_positive = */ 0,
/* .additional_animation = */ 0,
/* .animation = */ 0,
/* .flags = */ 0,
/* .base_num_frames = */ 1,
/* .base_image_id = */ 29110,

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

@ -1461,7 +1461,7 @@ static bool vehicle_open_restraints(rct_vehicle * vehicle)
continue;
}
}
if (vehicleEntry->additional_animation == VEHICLE_ENTRY_ADDITIONAL_ANIMATION_6 && vehicle->animation_frame != 0)
if (vehicleEntry->animation == VEHICLE_ENTRY_ANIMATION_OBSERVATION_TOWER && vehicle->animation_frame != 0)
{
if (vehicle->var_C8 + 0x3333 < 0xFFFF)
@ -7284,9 +7284,9 @@ static void vehicle_update_additional_animation(rct_vehicle * vehicle)
{
return;
}
switch (vehicleEntry->additional_animation)
switch (vehicleEntry->animation)
{
case VEHICLE_ENTRY_ADDITIONAL_ANIMATION_MINITURE_RAILWAY_LOCOMOTIVE: // loc_6D652B
case VEHICLE_ENTRY_ANIMATION_MINITURE_RAILWAY_LOCOMOTIVE: // loc_6D652B
*var_C8 += _vehicleVelocityF64E08;
al = (*var_C8 >> 20) & 3;
if (vehicle->animation_frame != al)
@ -7319,7 +7319,7 @@ static void vehicle_update_additional_animation(rct_vehicle * vehicle)
vehicle_invalidate(vehicle);
}
break;
case VEHICLE_ENTRY_ADDITIONAL_ANIMATION_2: // loc_6D6424
case VEHICLE_ENTRY_ANIMATION_SWAN: // loc_6D6424
*var_C8 += _vehicleVelocityF64E08;
al = (*var_C8 >> 18) & 2;
if (vehicle->animation_frame != al)
@ -7328,7 +7328,7 @@ static void vehicle_update_additional_animation(rct_vehicle * vehicle)
vehicle_invalidate(vehicle);
}
break;
case VEHICLE_ENTRY_ADDITIONAL_ANIMATION_3: // loc_6D6482
case VEHICLE_ENTRY_ANIMATION_CANOES: // loc_6D6482
*var_C8 += _vehicleVelocityF64E08;
eax = ((*var_C8 >> 13) & 0xFF) * 6;
ah = (eax >> 8) & 0xFF;
@ -7338,7 +7338,7 @@ static void vehicle_update_additional_animation(rct_vehicle * vehicle)
vehicle_invalidate(vehicle);
}
break;
case VEHICLE_ENTRY_ADDITIONAL_ANIMATION_4: // loc_6D64F7
case VEHICLE_ENTRY_ANIMATION_ROW_BOATS: // loc_6D64F7
*var_C8 += _vehicleVelocityF64E08;
eax = ((*var_C8 >> 13) & 0xFF) * 7;
ah = (eax >> 8) & 0xFF;
@ -7348,7 +7348,7 @@ static void vehicle_update_additional_animation(rct_vehicle * vehicle)
vehicle_invalidate(vehicle);
}
break;
case VEHICLE_ENTRY_ADDITIONAL_ANIMATION_5: // loc_6D6453
case VEHICLE_ENTRY_ANIMATION_WATER_TRICYCLES: // loc_6D6453
*var_C8 += _vehicleVelocityF64E08;
al = (*var_C8 >> 19) & 1;
if (vehicle->animation_frame != al)
@ -7357,7 +7357,7 @@ static void vehicle_update_additional_animation(rct_vehicle * vehicle)
vehicle_invalidate(vehicle);
}
break;
case VEHICLE_ENTRY_ADDITIONAL_ANIMATION_6: // loc_6D65C3
case VEHICLE_ENTRY_ANIMATION_OBSERVATION_TOWER: // loc_6D65C3
if (vehicle->var_C8 <= 0xCCCC)
{
vehicle->var_C8 += 0x3333;
@ -7370,7 +7370,7 @@ static void vehicle_update_additional_animation(rct_vehicle * vehicle)
vehicle_invalidate(vehicle);
}
break;
case VEHICLE_ENTRY_ADDITIONAL_ANIMATION_7: // loc_6D63F5
case VEHICLE_ENTRY_ANIMATION_HELICARS: // loc_6D63F5
*var_C8 += _vehicleVelocityF64E08;
al = (*var_C8 >> 18) & 3;
if (vehicle->animation_frame != al)
@ -7379,7 +7379,7 @@ static void vehicle_update_additional_animation(rct_vehicle * vehicle)
vehicle_invalidate(vehicle);
}
break;
case VEHICLE_ENTRY_ADDITIONAL_ANIMATION_8: // loc_6D64B6
case VEHICLE_ENTRY_ANIMATION_MONORAIL_CYCLES: // loc_6D64B6
if (vehicle->num_peeps != 0)
{
*var_C8 += _vehicleVelocityF64E08;
@ -7392,7 +7392,7 @@ static void vehicle_update_additional_animation(rct_vehicle * vehicle)
}
}
break;
case VEHICLE_ENTRY_ADDITIONAL_ANIMATION_9: // loc_6D65E1
case VEHICLE_ENTRY_ANIMATION_MULTI_DIM_COASTER: // loc_6D65E1
if (vehicle->seat_rotation != vehicle->target_seat_rotation)
{
if (vehicle->var_C8 <= 0xCCCC)

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

@ -42,7 +42,7 @@ typedef struct rct_ride_entry_vehicle {
uint8 sprite_width; // 0x0E , 0x28
uint8 sprite_height_negative; // 0x0F , 0x29
uint8 sprite_height_positive; // 0x10 , 0x2A
uint8 additional_animation; // 0x11 , 0x2B
uint8 animation; // 0x11 , 0x2B
uint32 flags; // 0x12 , 0x2C
uint16 base_num_frames; // 0x16 , 0x30, The number of sprites for a flat non-banked track piece.
uint32 base_image_id; // 0x18 , 0x32, Following image_id's populated during loading
@ -260,16 +260,16 @@ enum {
};
enum {
VEHICLE_ENTRY_ADDITIONAL_ANIMATION_0,
VEHICLE_ENTRY_ADDITIONAL_ANIMATION_MINITURE_RAILWAY_LOCOMOTIVE,
VEHICLE_ENTRY_ADDITIONAL_ANIMATION_2,
VEHICLE_ENTRY_ADDITIONAL_ANIMATION_3,
VEHICLE_ENTRY_ADDITIONAL_ANIMATION_4,
VEHICLE_ENTRY_ADDITIONAL_ANIMATION_5,
VEHICLE_ENTRY_ADDITIONAL_ANIMATION_6,
VEHICLE_ENTRY_ADDITIONAL_ANIMATION_7,
VEHICLE_ENTRY_ADDITIONAL_ANIMATION_8,
VEHICLE_ENTRY_ADDITIONAL_ANIMATION_9
VEHICLE_ENTRY_ANIMATION_NONE,
VEHICLE_ENTRY_ANIMATION_MINITURE_RAILWAY_LOCOMOTIVE,
VEHICLE_ENTRY_ANIMATION_SWAN,
VEHICLE_ENTRY_ANIMATION_CANOES,
VEHICLE_ENTRY_ANIMATION_ROW_BOATS,
VEHICLE_ENTRY_ANIMATION_WATER_TRICYCLES,
VEHICLE_ENTRY_ANIMATION_OBSERVATION_TOWER,
VEHICLE_ENTRY_ANIMATION_HELICARS,
VEHICLE_ENTRY_ANIMATION_MONORAIL_CYCLES,
VEHICLE_ENTRY_ANIMATION_MULTI_DIM_COASTER
};
enum {