mirror of https://github.com/OpenRCT2/OpenRCT2.git
Name some flags
This commit is contained in:
parent
e82a2de997
commit
04953b921e
|
@ -1054,7 +1054,7 @@ static void ride_remove_vehicles(rct_ride *ride)
|
|||
{
|
||||
if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) {
|
||||
ride->lifecycle_flags &= ~RIDE_LIFECYCLE_ON_TRACK;
|
||||
ride->lifecycle_flags &= ~(RIDE_LIFECYCLE_TEST_IN_PROGRESS | RIDE_LIFECYCLE_11);
|
||||
ride->lifecycle_flags &= ~(RIDE_LIFECYCLE_TEST_IN_PROGRESS | RIDE_LIFECYCLE_HAS_STALLED_VEHICLE);
|
||||
|
||||
for (size_t i = 0; i < 32; i++) {
|
||||
uint16 spriteIndex = ride->vehicles[i];
|
||||
|
@ -2331,7 +2331,7 @@ static int ride_get_new_breakdown_problem(rct_ride *ride)
|
|||
_breakdownProblemProbabilities[BREAKDOWN_BRAKES_FAILURE] = gClimateCurrentRainLevel == 0 ? 3 : 20;
|
||||
|
||||
entry = get_ride_entry_by_ride(ride);
|
||||
if (entry->flags & RIDE_ENTRY_FLAG_14)
|
||||
if (entry->flags & RIDE_ENTRY_FLAG_CANNOT_BREAK_DOWN)
|
||||
return -1;
|
||||
|
||||
availableBreakdownProblems = RideAvailableBreakdowns[ride->type];
|
||||
|
|
|
@ -398,7 +398,7 @@ enum {
|
|||
RIDE_LIFECYCLE_DUE_INSPECTION = 1 << 8,
|
||||
RIDE_LIFECYCLE_QUEUE_FULL = 1 << 9,
|
||||
RIDE_LIFECYCLE_CRASHED = 1 << 10,
|
||||
RIDE_LIFECYCLE_11 = 1 << 11,
|
||||
RIDE_LIFECYCLE_HAS_STALLED_VEHICLE = 1 << 11,
|
||||
RIDE_LIFECYCLE_EVER_BEEN_OPENED = 1 << 12,
|
||||
RIDE_LIFECYCLE_MUSIC = 1 << 13,
|
||||
RIDE_LIFECYCLE_INDESTRUCTIBLE = 1 << 14,
|
||||
|
@ -427,7 +427,7 @@ enum {
|
|||
RIDE_ENTRY_FLAG_11 = 1 << 11, // 0x800
|
||||
RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME = 1 << 12, // 0x1000
|
||||
RIDE_ENTRY_FLAG_SEPARATE_RIDE = 1 << 13, // 0x2000
|
||||
RIDE_ENTRY_FLAG_14 = 1 << 14, // 0x4000
|
||||
RIDE_ENTRY_FLAG_CANNOT_BREAK_DOWN = 1 << 14, // 0x4000
|
||||
RIDE_ENTRY_DISABLE_LAST_OPERATING_MODE = 1 << 15, // 0x8000
|
||||
RIDE_ENTRY_FLAG_16 = 1 << 16, // 0x10000
|
||||
RIDE_ENTRY_DISABLE_FIRST_TWO_OPERATING_MODES = 1 << 17, // 0x20000
|
||||
|
|
|
@ -2941,7 +2941,7 @@ static void vehicle_check_if_missing(rct_vehicle* vehicle) {
|
|||
return;
|
||||
|
||||
vehicle->lost_time_out++;
|
||||
if (ride->lifecycle_flags & RIDE_LIFECYCLE_11)
|
||||
if (ride->lifecycle_flags & RIDE_LIFECYCLE_HAS_STALLED_VEHICLE)
|
||||
return;
|
||||
|
||||
uint16 limit = ride->type == RIDE_TYPE_BOAT_RIDE ? 15360 : 9600;
|
||||
|
@ -2949,7 +2949,7 @@ static void vehicle_check_if_missing(rct_vehicle* vehicle) {
|
|||
if (vehicle->lost_time_out <= limit)
|
||||
return;
|
||||
|
||||
ride->lifecycle_flags |= RIDE_LIFECYCLE_11;
|
||||
ride->lifecycle_flags |= RIDE_LIFECYCLE_HAS_STALLED_VEHICLE;
|
||||
|
||||
set_format_arg(0, rct_string_id, RideComponentNames[RideNameConvention[ride->type].vehicle].number);
|
||||
|
||||
|
|
|
@ -2145,7 +2145,7 @@ static void window_ride_show_open_dropdown(rct_window *w, rct_widget *widget)
|
|||
switch (ride->status) {
|
||||
case RIDE_STATUS_CLOSED:
|
||||
highlightedIndex = 0;
|
||||
if ((ride->lifecycle_flags & RIDE_LIFECYCLE_CRASHED) || (ride->lifecycle_flags & RIDE_LIFECYCLE_11))
|
||||
if ((ride->lifecycle_flags & RIDE_LIFECYCLE_CRASHED) || (ride->lifecycle_flags & RIDE_LIFECYCLE_HAS_STALLED_VEHICLE))
|
||||
break;
|
||||
|
||||
highlightedIndex = 2;
|
||||
|
|
Loading…
Reference in New Issue