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

Name further entry flags

This commit is contained in:
duncanspumpkin 2018-01-17 21:49:38 +00:00 committed by Duncan
parent addf087918
commit eb5f8485fa
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,7 +505,7 @@ uint8 RideObject::CalculateNumHorizontalFrames(const rct_ride_entry_vehicle * ve
uint8 numHorizontalFrames;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SWINGING)
{
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_21) && !(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_27))
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_21) && !(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SLIDE_SWING))
{
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_25)
{
@ -516,7 +516,7 @@ uint8 RideObject::CalculateNumHorizontalFrames(const rct_ride_entry_vehicle * ve
numHorizontalFrames = 5;
}
}
else if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_21) || !(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_27))
else if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_21) || !(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SLIDE_SWING))
{
numHorizontalFrames = 7;
}

16
src/openrct2/peep/Peep.cpp
View File

@ -2636,7 +2636,7 @@ static void peep_go_to_ride_entrance(rct_peep * peep, Ride * ride)
if (rideEntry != nullptr)
{
if (rideEntry->vehicles[rideEntry->default_vehicle].flags & VEHICLE_ENTRY_FLAG_MINI_GOLF ||
rideEntry->vehicles[rideEntry->default_vehicle].flags & (VEHICLE_ENTRY_FLAG_28 | VEHICLE_ENTRY_FLAG_30))
rideEntry->vehicles[rideEntry->default_vehicle].flags & (VEHICLE_ENTRY_FLAG_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
{
shift_multiplier = 32;
}
@ -2877,7 +2877,7 @@ static void peep_update_ride_sub_state_1(rct_peep * peep)
{
uint8 vehicle = ride_entry->default_vehicle;
if (ride_entry->vehicles[vehicle].flags & VEHICLE_ENTRY_FLAG_MINI_GOLF ||
ride_entry->vehicles[vehicle].flags & (VEHICLE_ENTRY_FLAG_28 | VEHICLE_ENTRY_FLAG_30))
ride_entry->vehicles[vehicle].flags & (VEHICLE_ENTRY_FLAG_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
{
distanceThreshold = 28;
}
@ -3047,7 +3047,7 @@ static void peep_update_ride_sub_state_1(rct_peep * peep)
return;
}
if (vehicle_type->flags & VEHICLE_ENTRY_FLAG_31)
if (vehicle_type->flags & VEHICLE_ENTRY_FLAG_DODGEM_CAR_PLACEMENT)
{
peep->destination_x = vehicle->x;
peep->destination_y = vehicle->y;
@ -3117,7 +3117,7 @@ static void peep_go_to_ride_exit(rct_peep * peep, Ride * ride, sint16 x, sint16
{
rct_ride_entry_vehicle * vehicle_entry = &rideEntry->vehicles[rideEntry->default_vehicle];
if (vehicle_entry->flags & VEHICLE_ENTRY_FLAG_MINI_GOLF ||
vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_28 | VEHICLE_ENTRY_FLAG_30))
vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
{
shift_multiplier = 32;
}
@ -3489,12 +3489,12 @@ static void peep_update_ride_sub_state_7(rct_peep * peep)
{
vehicle_entry = &ride_entry->vehicles[ride_entry->default_vehicle];
if (vehicle_entry->flags & VEHICLE_ENTRY_FLAG_30)
if (vehicle_entry->flags & VEHICLE_ENTRY_FLAG_GO_KART)
{
shift_multiplier = 9;
}
if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_28 | VEHICLE_ENTRY_FLAG_30))
if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
{
direction = ((vehicle->sprite_direction + 3) / 8) + 1;
direction &= 3;
@ -3642,7 +3642,7 @@ static void peep_update_ride_prepare_for_state_9(rct_peep * peep)
if (ride_type != nullptr)
{
rct_ride_entry_vehicle * vehicle_entry = &ride_type->vehicles[ride_type->default_vehicle];
if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_28 | VEHICLE_ENTRY_FLAG_30))
if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
{
shift_multiplier = 32;
}
@ -3888,7 +3888,7 @@ static void peep_update_ride_sub_state_13(rct_peep * peep)
rct_ride_entry * ride_type = get_ride_entry(ride->subtype);
rct_ride_entry_vehicle * vehicle_entry = &ride_type->vehicles[ride_type->default_vehicle];
if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_28 | VEHICLE_ENTRY_FLAG_30))
if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
{
shift_multiplier = 32;
}

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

@ -4491,7 +4491,7 @@ static rct_vehicle *vehicle_create_car(
regs.edx = vehicleEntry->spacing >> 1;
*remainingDistance -= regs.edx;
vehicle->remaining_distance = *remainingDistance;
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_30)) {
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_GO_KART)) {
*remainingDistance -= regs.edx;
}
@ -4527,7 +4527,7 @@ static rct_vehicle *vehicle_create_car(
vehicle->peep[i] = SPRITE_INDEX_NULL;
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_31) {
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_DODGEM_CAR_PLACEMENT) {
// loc_6DDCA4:
vehicle->var_CD = 0;
sint32 direction = tile_element_get_direction(tileElement);
@ -4558,11 +4558,11 @@ static rct_vehicle *vehicle_create_car(
sprite_move(chosenLoc.x, chosenLoc.y, z, (rct_sprite*)vehicle);
} else {
regs.dl = 0;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_28) {
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_CHAIR_LIFT) {
regs.dl = 1;
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_30) {
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_GO_KART) {
// Choose which lane Go Kart should start in
regs.dl = 5;
if (vehicleIndex & 1) {
@ -4848,7 +4848,7 @@ static bool ride_create_vehicles(Ride *ride, sint32 rideIndex, rct_xy_element *e
rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle);
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_31)) {
if (!(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_DODGEM_CAR_PLACEMENT)) {
vehicle_update_track_motion(vehicle, nullptr);
}

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

@ -4003,7 +4003,7 @@ loc_6D8E36:
vehicle->var_C0++;
if ((flags & VEHICLE_UPDATE_MOTION_TRACK_FLAG_1) &&
(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_30) &&
(vehicleEntry->flags & VEHICLE_ENTRY_FLAG_GO_KART) &&
(vehicle->var_C0 < 40))
{
return;
@ -6666,7 +6666,7 @@ static void check_and_apply_block_section_stop_site(rct_vehicle * vehicle)
}
// Is chair lift type
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_28)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_CHAIR_LIFT)
{
sint32 velocity = ride->speed << 16;
if (_vehicleBreakdown == 0)
@ -6970,7 +6970,7 @@ static void vehicle_update_swinging_car(rct_vehicle * vehicle)
}
sint16 cx = -dx;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_27)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SLIDE_SWING)
{
dx = 5370;
cx = -5370;
@ -7768,7 +7768,7 @@ static bool vehicle_update_motion_collision_detection(rct_vehicle * vehicle, sin
if (x_diff + y_diff >= ecx)
continue;
if (!(collideType->flags & VEHICLE_ENTRY_FLAG_30))
if (!(collideType->flags & VEHICLE_ENTRY_FLAG_GO_KART))
{
mayCollide = true;
break;
@ -7953,11 +7953,11 @@ static void sub_6DBF3E(rct_vehicle * vehicle)
else
{
uint16 cx = 17;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_28)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_CHAIR_LIFT)
{
cx = 6;
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_30)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_GO_KART)
{
cx = vehicle->var_CD == 6 ? 18 : 20;
}
@ -8102,7 +8102,7 @@ loc_6DB41D:
{
return false;
}
if ((vehicleEntry->flags & VEHICLE_ENTRY_FLAG_30) && vehicle->var_CD < 7)
if ((vehicleEntry->flags & VEHICLE_ENTRY_FLAG_GO_KART) && vehicle->var_CD < 7)
{
trackType = track_element_get_type(tileElement);
if (trackType == TRACK_ELEM_FLAT)
@ -8393,7 +8393,7 @@ loc_6DB967:
}
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_30)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_GO_KART)
{
vehicle->velocity -= vehicle->velocity >> 2;
}
@ -8713,7 +8713,7 @@ loc_6DBE7F:
}
}
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_30)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_GO_KART)
{
vehicle->velocity -= vehicle->velocity >> 2;
_vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_2;

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

@ -252,11 +252,11 @@ enum {
VEHICLE_ENTRY_FLAG_24 = 1 << 24,
VEHICLE_ENTRY_FLAG_25 = 1 << 25,
VEHICLE_ENTRY_FLAG_26 = 1 << 26,
VEHICLE_ENTRY_FLAG_27 = 1 << 27,
VEHICLE_ENTRY_FLAG_28 = 1 << 28,
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.
VEHICLE_ENTRY_FLAG_CHAIR_LIFT = 1 << 28,
VEHICLE_ENTRY_FLAG_WATER_RIDE = 1 << 29, // Set on rides where water would provide continuous propulsion
VEHICLE_ENTRY_FLAG_30 = 1 << 30,
VEHICLE_ENTRY_FLAG_31 = 1u << 31,
VEHICLE_ENTRY_FLAG_GO_KART = 1 << 30,
VEHICLE_ENTRY_FLAG_DODGEM_CAR_PLACEMENT = 1u << 31,
};
enum {