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

Update name of chairlift flag

This commit is contained in:
duncanspumpkin 2018-01-29 18:06:05 +00:00 committed by Duncan
parent d17a9d8f42
commit ac2ad02491
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
rideEntry->vehicles[rideEntry->default_vehicle].flags & (VEHICLE_ENTRY_FLAG_CHAIRLIFT | 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_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
ride_entry->vehicles[vehicle].flags & (VEHICLE_ENTRY_FLAG_CHAIRLIFT | VEHICLE_ENTRY_FLAG_GO_KART))
{
distanceThreshold = 28;
}
@ -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_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_CHAIRLIFT | VEHICLE_ENTRY_FLAG_GO_KART))
{
shift_multiplier = 32;
}
@ -3494,7 +3494,7 @@ static void peep_update_ride_sub_state_7(rct_peep * peep)
shift_multiplier = 9;
}
if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_CHAIRLIFT | 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_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_CHAIRLIFT | 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_CHAIR_LIFT | VEHICLE_ENTRY_FLAG_GO_KART))
if (vehicle_entry->flags & (VEHICLE_ENTRY_FLAG_CHAIRLIFT | VEHICLE_ENTRY_FLAG_GO_KART))
{
shift_multiplier = 32;
}

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

@ -4558,7 +4558,7 @@ 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_CHAIR_LIFT) {
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_CHAIRLIFT) {
regs.dl = 1;
}

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

@ -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_CHAIR_LIFT)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_CHAIRLIFT)
{
sint32 velocity = ride->speed << 16;
if (_vehicleBreakdown == 0)
@ -7953,7 +7953,7 @@ static void sub_6DBF3E(rct_vehicle * vehicle)
else
{
uint16 cx = 17;
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_CHAIR_LIFT)
if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_CHAIRLIFT)
{
cx = 6;
}

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

@ -253,7 +253,7 @@ enum {
VEHICLE_ENTRY_FLAG_25 = 1 << 25,
VEHICLE_ENTRY_FLAG_26 = 1 << 26,
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_CHAIRLIFT = 1 << 28,
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,