1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 23:34:37 +01:00

replace ride_window_invalidate flags with constants

This commit is contained in:
Kevin Burke
2015-03-22 17:28:15 -07:00
parent ebd02d022a
commit 23bfd13ba9
8 changed files with 69 additions and 58 deletions

View File

@@ -134,7 +134,7 @@ void finance_pay_ride_upkeep()
sint16 upkeep = ride->upkeep_cost;
if (upkeep != -1) {
ride->total_profit -= upkeep;
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
finance_payment(upkeep, RCT_EXPENDITURE_TYPE_RIDE_RUNNING_COSTS);
}
}

View File

@@ -349,7 +349,7 @@ void peep_decrement_num_riders(rct_peep* peep){
rct_ride* ride = GET_RIDE(peep->current_ride);
ride->num_riders--;
ride->window_invalidate_flags |= 0xC;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST;
}
}
@@ -373,7 +373,7 @@ void peep_window_state_update(rct_peep* peep){
if (peep->state == PEEP_STATE_ON_RIDE || peep->state == PEEP_STATE_ENTERING_RIDE){
rct_ride* ride = GET_RIDE(peep->current_ride);
ride->num_riders++;
ride->window_invalidate_flags |= 0xC;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST;
}
window_invalidate_by_class(WC_GUEST_LIST);

View File

@@ -210,7 +210,7 @@ void ride_update_favourited_stat()
if (peep->favourite_ride != 0xff) {
ride = &g_ride_list[peep->favourite_ride];
ride->guests_favourite++;
ride->window_invalidate_flags |= 1;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_CUSTOMER;
}
@@ -667,7 +667,7 @@ static void ride_clear_for_construction(int rideIndex)
ride_measurement_clear(ride);
ride->lifecycle_flags &= ~(RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN);
ride->window_invalidate_flags |= 0x0C;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST;
ride_remove_cable_lift(ride);
ride_remove_vehicles(ride);
@@ -764,7 +764,7 @@ static void ride_remove_peeps(int rideIndex)
ride->num_riders = 0;
ride->var_15D = 0;
ride->window_invalidate_flags |= 4;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN;
}
int sub_6C683D(int* x, int* y, int z, int direction, int type, int esi, int edi, int ebp)
@@ -1136,10 +1136,10 @@ static void ride_update(int rideIndex)
ride->var_126 = ride->var_124;
ride->var_124 = ride->var_120;
ride->var_120 = 0;
ride->window_invalidate_flags |= 1;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_CUSTOMER;
ride->income_per_hour = ride_calculate_income_per_hour(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
if (ride->upkeep_cost != (money16)0xFFFF)
ride->profit = (ride->income_per_hour - ((money32)ride->upkeep_cost * 16));
@@ -1208,7 +1208,7 @@ void ride_update_popularity(rct_ride* ride, uint8 pop_amount){
ride->popularity = ride->popularity_next;
ride->popularity_next = 0;
ride->popularity_time_out = 0;
ride->window_invalidate_flags |= 1;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_CUSTOMER;
}
/**
@@ -1369,7 +1369,7 @@ static void ride_breakdown_update(int rideIndex)
ride->var_19E = ride->var_19D;
ride->var_19D = ride->var_19C;
ride->var_19C = 0;
ride->window_invalidate_flags |= 32;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE;
}
if (ride->lifecycle_flags & (RIDE_LIFECYCLE_BREAKDOWN_PENDING | RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED))
@@ -1380,7 +1380,7 @@ static void ride_breakdown_update(int rideIndex)
// Calculate breakdown probability?
unreliabilityAccumulator = ride->unreliability_factor + get_age_penalty(ride);
ride->reliability = max(0, ride->reliability - unreliabilityAccumulator);
ride->window_invalidate_flags |= 32;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE;
// Random probability of a breakdown. Roughly this is 1 in
//
@@ -1582,6 +1582,7 @@ static void ride_mechanic_status_update(int rideIndex, int mechanicStatus)
breakdownReason == BREAKDOWN_CONTROL_FAILURE
) {
ride->lifecycle_flags |= RIDE_LIFECYCLE_BROKEN_DOWN;
// 0x06b7670: or byte_1362A45[esi], 2Ch
ride->window_invalidate_flags |= 0x2C;
ride->mechanic_status = RIDE_MECHANIC_STATUS_CALLING;
ride->breakdown_reason = breakdownReason;
@@ -1604,7 +1605,7 @@ static void ride_mechanic_status_update(int rideIndex, int mechanicStatus)
mechanic->current_ride != rideIndex
) {
ride->mechanic_status = RIDE_MECHANIC_STATUS_CALLING;
ride->window_invalidate_flags |= 0x20;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE;
ride_mechanic_status_update(rideIndex, RIDE_MECHANIC_STATUS_CALLING);
}
break;
@@ -1620,7 +1621,7 @@ static void ride_mechanic_status_update(int rideIndex, int mechanicStatus)
)
) {
ride->mechanic_status = RIDE_MECHANIC_STATUS_CALLING;
ride->window_invalidate_flags |= 0x20;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE;
ride_mechanic_status_update(rideIndex, RIDE_MECHANIC_STATUS_CALLING);
}
break;
@@ -1641,7 +1642,7 @@ static void ride_call_mechanic(int rideIndex, rct_peep *mechanic, int forInspect
peep_window_state_update(mechanic);
mechanic->sub_state = 0;
ride->mechanic_status = RIDE_MECHANIC_STATUS_HEADING;
ride->window_invalidate_flags |= 0x20;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE;
ride->mechanic = mechanic->sprite_index;
mechanic->current_ride = rideIndex;
mechanic->current_ride_station = ride->inspection_station;
@@ -3481,7 +3482,7 @@ void game_command_set_ride_status(int *eax, int *ebx, int *ecx, int *edx, int *e
ride->status = RIDE_STATUS_CLOSED;
ride->lifecycle_flags &= ~RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING;
ride->race_winner = 0xFFFF;
ride->window_invalidate_flags |= (1 << 2) | (1 << 3);
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST;
window_invalidate_by_number(WC_RIDE, rideIndex);
}
*ebx = 0;
@@ -3502,7 +3503,7 @@ void game_command_set_ride_status(int *eax, int *ebx, int *ecx, int *edx, int *e
ride->race_winner = 0xFFFF;
ride->status = targetStatus;
ride_get_measurement(rideIndex, NULL);
ride->window_invalidate_flags |= (1 << 2) | (1 << 3);
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST;
window_invalidate_by_number(WC_RIDE, rideIndex);
}
*ebx = 0;

View File

@@ -610,6 +610,16 @@ enum {
RIDE_INSPECTION_NEVER
};
// Flags used by ride->window_invalidate_flags
enum {
RIDE_INVALIDATE_RIDE_CUSTOMER = 1,
RIDE_INVALIDATE_RIDE_INCOME = 1 << 1,
RIDE_INVALIDATE_RIDE_MAIN = 1 << 2,
RIDE_INVALIDATE_RIDE_LIST = 1 << 3,
RIDE_INVALIDATE_RIDE_OPERATING = 1 << 4,
RIDE_INVALIDATE_RIDE_MAINTENANCE = 1 << 5,
};
typedef struct {
uint8 main;
uint8 additional;

View File

@@ -860,7 +860,7 @@ static void ride_ratings_calculate_mine_train_coaster(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= sub_65E72D(ride) << 5;
@@ -893,7 +893,7 @@ static void ride_ratings_calculate_maze(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 0 << 5;
@@ -928,7 +928,7 @@ static void ride_ratings_calculate_spiral_slide(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 2 << 5;
@@ -960,7 +960,7 @@ static void ride_ratings_calculate_pirate_ship(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 0 << 5;
@@ -992,7 +992,7 @@ static void ride_ratings_calculate_inverter_ship(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 0 << 5;
@@ -1001,19 +1001,19 @@ static void ride_ratings_calculate_inverter_ship(rct_ride *ride)
static void ride_ratings_calculate_food_stall(rct_ride *ride)
{
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
}
static void ride_ratings_calculate_drink_stall(rct_ride *ride)
{
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
}
static void ride_ratings_calculate_shop(rct_ride *ride)
{
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
}
static void ride_ratings_calculate_merry_go_round(rct_ride *ride)
@@ -1036,7 +1036,7 @@ static void ride_ratings_calculate_merry_go_round(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 7 << 5;
@@ -1045,13 +1045,13 @@ static void ride_ratings_calculate_merry_go_round(rct_ride *ride)
static void ride_ratings_calculate_information_kiosk(rct_ride *ride)
{
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
}
static void ride_ratings_calculate_bathroom(rct_ride *ride)
{
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
}
static void ride_ratings_calculate_ferris_wheel(rct_ride *ride)
@@ -1074,7 +1074,7 @@ static void ride_ratings_calculate_ferris_wheel(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 0 << 5;
@@ -1106,7 +1106,7 @@ static void ride_ratings_calculate_motion_simulator(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 7 << 5;
@@ -1147,7 +1147,7 @@ static void ride_ratings_calculate_3d_cinema(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 7 << 5;
@@ -1190,7 +1190,7 @@ static void ride_ratings_calculate_top_spin(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 0 << 5;
@@ -1218,7 +1218,7 @@ static void ride_ratings_calculate_space_rings(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 0 << 5;
@@ -1253,7 +1253,7 @@ static void ride_ratings_calculate_elevator(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 7 << 5;
@@ -1265,7 +1265,7 @@ static void ride_ratings_calculate_elevator(rct_ride *ride)
static void ride_ratings_calculate_atm(rct_ride *ride)
{
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
}
static void ride_ratings_calculate_twist(rct_ride *ride)
@@ -1294,7 +1294,7 @@ static void ride_ratings_calculate_twist(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 0 << 5;
@@ -1319,7 +1319,7 @@ static void ride_ratings_calculate_haunted_house(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 0xE0;
@@ -1377,7 +1377,7 @@ static void ride_ratings_calculate_mini_golf(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= sub_65E72D(ride) << 5;
@@ -1386,7 +1386,7 @@ static void ride_ratings_calculate_mini_golf(rct_ride *ride)
static void ride_ratings_calculate_first_aid(rct_ride *ride)
{
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
}
static void ride_ratings_calculate_circus_show(rct_ride *ride)
@@ -1408,7 +1408,7 @@ static void ride_ratings_calculate_circus_show(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 7 << 5;
@@ -1433,7 +1433,7 @@ static void ride_ratings_calculate_crooked_house(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 0xE0;
@@ -1465,7 +1465,7 @@ static void ride_ratings_calculate_magic_carpet(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 0 << 5;
@@ -1497,7 +1497,7 @@ static void ride_ratings_calculate_enterprise(rct_ride *ride)
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
ride->window_invalidate_flags |= 2;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME;
ride->inversions &= 0x1F;
ride->inversions |= 3 << 5;

View File

@@ -128,7 +128,7 @@ static void ride_update_station_bumpercar(rct_ride *ride, int stationIndex)
// Begin the match
ride->lifecycle_flags |= RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING;
ride->station_depart[stationIndex] |= STATION_DEPART_FLAG;
ride->window_invalidate_flags |= 12;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST;
}
}
@@ -188,7 +188,7 @@ static void ride_update_station_race(rct_ride *ride, int stationIndex)
if (vehicle->num_peeps != 0) {
peep = &(g_sprite_list[vehicle->peep[0]].peep);
ride->race_winner = peep->sprite_index;
ride->window_invalidate_flags |= 12;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST;
}
// Race is over
@@ -214,7 +214,7 @@ static void ride_update_station_race(rct_ride *ride, int stationIndex)
ride_race_init_vehicle_speeds(ride);
ride->lifecycle_flags |= RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING;
ride->station_depart[stationIndex] |= STATION_DEPART_FLAG;
ride->window_invalidate_flags |= 12;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST;
}
}
@@ -315,4 +315,4 @@ rct_map_element *ride_get_station_exit_element(rct_ride *ride, int x, int y, int
} while (!map_element_is_last_for_tile(mapElement++));
return NULL;
}
}

View File

@@ -1901,7 +1901,7 @@ static void window_ride_main_update(rct_window *w)
// Update status
ride = GET_RIDE(w->number);
if (!(ride->window_invalidate_flags & 4)) {
if (!(ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_MAIN)) {
if (w->ride.view == 0)
return;
@@ -1923,7 +1923,7 @@ static void window_ride_main_update(rct_window *w)
}
}
ride->window_invalidate_flags &= ~4;
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_MAIN;
widget_invalidate(w, WIDX_STATUS);
}
@@ -2950,8 +2950,8 @@ static void window_ride_operating_update(rct_window *w)
widget_invalidate(w, WIDX_TAB_3);
ride = GET_RIDE(w->number);
if (ride->window_invalidate_flags & 0x10) {
ride->window_invalidate_flags &= ~0x10;
if (ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_OPERATING) {
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_OPERATING;
window_invalidate(w);
}
}
@@ -3360,8 +3360,8 @@ static void window_ride_maintenance_update(rct_window *w)
widget_invalidate(w, WIDX_TAB_4);
ride = GET_RIDE(w->number);
if (ride->window_invalidate_flags & 0x20) {
ride->window_invalidate_flags &= ~0x20;
if (ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_MAINTENANCE) {
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_MAINTENANCE;
window_invalidate(w);
}
}
@@ -5451,8 +5451,8 @@ static void window_ride_income_update(rct_window *w)
widget_invalidate(w, WIDX_TAB_9);
ride = GET_RIDE(w->number);
if (ride->window_invalidate_flags & 2) {
ride->window_invalidate_flags &= ~2;
if (ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_INCOME) {
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_INCOME;
window_invalidate(w);
}
}
@@ -5735,8 +5735,8 @@ static void window_ride_customer_update(rct_window *w)
widget_invalidate(w, WIDX_TAB_10);
ride = GET_RIDE(w->number);
if (ride->window_invalidate_flags & 1) {
ride->window_invalidate_flags &= ~1;
if (ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_CUSTOMER) {
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_CUSTOMER;
window_invalidate(w);
}
}

View File

@@ -579,8 +579,8 @@ static void window_ride_list_refresh_list(rct_window *w)
continue;
countA++;
if (ride->window_invalidate_flags & 8) {
ride->window_invalidate_flags &= ~8;
if (ride->window_invalidate_flags & RIDE_INVALIDATE_RIDE_LIST) {
ride->window_invalidate_flags &= ~RIDE_INVALIDATE_RIDE_LIST;
countB++;
}
}