diff --git a/src/peep/peep.c b/src/peep/peep.c index 8e10b4a83e..a793c055cf 100644 --- a/src/peep/peep.c +++ b/src/peep/peep.c @@ -3662,7 +3662,7 @@ static bool peep_update_fixing_sub_state_7(bool firstRun, rct_peep *peep, rct_ri sint16 x, y, tmp_distance; if (!firstRun) { - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_15)) { + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_HAS_NO_TRACK)) { return true; } @@ -3742,7 +3742,7 @@ static bool peep_update_fixing_sub_state_9(bool firstRun, rct_peep *peep, rct_ri sint16 x, y, tmp_xy_distance; if (!firstRun) { - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_15)) { + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_HAS_NO_TRACK)) { return true; } @@ -3814,7 +3814,7 @@ static bool peep_update_fixing_sub_state_10(bool firstRun, rct_peep *peep, rct_r sint16 tmp_x, tmp_y, tmp_xy_distance; if (!firstRun) { - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_15)) { + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3 | RIDE_TYPE_FLAG_HAS_NO_TRACK)) { return true; } diff --git a/src/ride/ride.c b/src/ride/ride.c index 6a4b8190d9..fa23d73a5f 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -1343,7 +1343,7 @@ static void ride_construction_reset_current_piece() rct_ride *ride; ride = get_ride(_currentRideIndex); - if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_15) || ride->num_stations == 0) { + if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_NO_TRACK) || ride->num_stations == 0) { _currentTrackCurve = RCT2_GLOBAL(0x0097CC68 + (ride->type * 2), uint8) | 0x100; _currentTrackSlopeEnd = 0; _currentTrackBankEnd = 0; @@ -1389,7 +1389,7 @@ void ride_construction_set_default_next_piece() mapElement = trackBeginEnd.begin_element; trackType = mapElement->properties.track.type; - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_15)) { + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_NO_TRACK)) { ride_construction_reset_current_piece(); return; } @@ -1728,7 +1728,7 @@ int ride_modify(rct_xy_element *input) _currentTrackSelectionFlags = 0; _rideConstructionArrowPulseTime = 0; - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_15)) { + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_NO_TRACK)) { sub_6C84CE(); return 1; } @@ -3810,7 +3810,7 @@ int ride_mode_check_station_present(rct_ride* ride){ if (stationIndex == -1) { RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT, uint16) = STR_NOT_YET_CONSTRUCTED; - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_15)) + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_NO_TRACK)) return -1; if (ride->type == RIDE_TYPE_MAZE) diff --git a/src/ride/ride.h b/src/ride/ride.h index ad9719e4ea..7d354c75e1 100644 --- a/src/ride/ride.h +++ b/src/ride/ride.h @@ -741,7 +741,7 @@ enum { RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIETIES = 1 << 12, // used by rides with two variaties, like the u and o shapes of the dinghy slide and the dry and submerged track of the water coaster RIDE_TYPE_FLAG_13 = 1 << 13, // used only by maze, spiral slide and shops RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS = 1 << 14, - RIDE_TYPE_FLAG_15 = 1 << 15, // something to do with station, price and viewport zoom + RIDE_TYPE_FLAG_HAS_NO_TRACK = 1 << 15, RIDE_TYPE_FLAG_16 = 1 << 16, // something to do with vehicle colour scheme RIDE_TYPE_FLAG_IS_SHOP = 1 << 17, RIDE_TYPE_FLAG_18 = 1 << 18, diff --git a/src/windows/maze_construction.c b/src/windows/maze_construction.c index 722efbf3c6..1e0667a067 100644 --- a/src/windows/maze_construction.c +++ b/src/windows/maze_construction.c @@ -380,7 +380,7 @@ static void window_maze_construction_entrance_tooldown(int x, int y, rct_window* rct_ride* ride = get_ride(rideIndex); if (ride_are_all_possible_entrances_and_exits_built(ride)){ tool_cancel(); - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_15)) + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_NO_TRACK)) window_close(w); } else{ diff --git a/src/windows/new_ride.c b/src/windows/new_ride.c index 5f8c5f5bc8..441c733e2b 100644 --- a/src/windows/new_ride.c +++ b/src/windows/new_ride.c @@ -921,7 +921,7 @@ static void window_new_ride_paint_ride_information(rct_window *w, rct_drawpixeli // rct_string_id stringId = 1691; - if (!ride_type_has_flag(item.type, RIDE_TYPE_FLAG_15)) + if (!ride_type_has_flag(item.type, RIDE_TYPE_FLAG_HAS_NO_TRACK)) stringId++; gfx_draw_string_right(dpi, stringId, &price, 0, x + width, y + 39); diff --git a/src/windows/ride.c b/src/windows/ride.c index 91d4f27b9a..50bc1d21ca 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -1531,7 +1531,7 @@ static void window_ride_init_viewport(rct_window *w) focus.coordinate.z = map_element_height(focus.coordinate.x, focus.coordinate.y) & 0xFFFF; focus.sprite.type |= 0x40; focus.coordinate.zoom = 1; - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_15)) + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_NO_TRACK)) focus.coordinate.zoom = 0; } focus.coordinate.var_480 = w->viewport_focus_coordinates.var_480; diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c index 7dc4a88c1a..387c676731 100644 --- a/src/windows/ride_construction.c +++ b/src/windows/ride_construction.c @@ -3710,7 +3710,7 @@ static void ride_construction_tooldown_entrance_exit(int screenX, int screenY) rct_ride *ride = get_ride(RCT2_GLOBAL(0x00F44192, uint8)); if (ride_are_all_possible_entrances_and_exits_built(ride)) { tool_cancel(); - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_15)) { + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_NO_TRACK)) { window_close_by_class(WC_RIDE_CONSTRUCTION); } } else {