From 2a435bfdae03277bc4c09072c92d6a3ee0153307 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Fri, 13 Jan 2017 09:49:29 +0100 Subject: [PATCH] Use constants for block brakes and some other elements --- src/openrct2/ride/ride.c | 14 +++++++------- src/openrct2/ride/track.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 2f59dab080..d181df4bfd 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -2888,7 +2888,7 @@ static void ride_measurement_update(rct_ride_measurement *measurement) } uint8 trackType = (vehicle->track_type >> 2) & 0xFF; - if (trackType == 216 || + if (trackType == TRACK_ELEM_BLOCK_BRAKES || trackType == TRACK_ELEM_CABLE_LIFT_HILL || trackType == TRACK_ELEM_25_DEG_UP_TO_FLAT || trackType == TRACK_ELEM_60_DEG_UP_TO_FLAT || @@ -4130,19 +4130,19 @@ static int ride_check_block_brakes(rct_xy_element *input, rct_xy_element *output track_circuit_iterator_begin(&it, *input); while (track_circuit_iterator_next(&it)) { - if (it.current.element->properties.track.type == 216) { + if (it.current.element->properties.track.type == TRACK_ELEM_BLOCK_BRAKES) { type = it.last.element->properties.track.type; - if (type == 1) { + if (type == TRACK_ELEM_END_STATION) { gGameCommandErrorText = STR_BLOCK_BRAKES_CANNOT_BE_USED_DIRECTLY_AFTER_STATION; *output = it.current; return 0; } - if (type == 216) { + if (type == TRACK_ELEM_BLOCK_BRAKES) { gGameCommandErrorText = STR_BLOCK_BRAKES_CANNOT_BE_USED_DIRECTLY_AFTER_EACH_OTHER; *output = it.current; return 0; } - if ((it.last.element->type & 0x80) && type != 209 && type != 210) { + if ((it.last.element->type & 0x80) && type != TRACK_ELEM_LEFT_CURVED_LIFT_HILL && type != TRACK_ELEM_RIGHT_CURVED_LIFT_HILL) { gGameCommandErrorText = STR_BLOCK_BRAKES_CANNOT_BE_USED_DIRECTLY_AFTER_THE_TOP_OF_THIS_LIFT_HILL; *output = it.current; return 0; @@ -4403,7 +4403,7 @@ static void ride_set_block_points(rct_xy_element *startElement) case TRACK_ELEM_60_DEG_UP_TO_FLAT: case TRACK_ELEM_DIAG_25_DEG_UP_TO_FLAT: case TRACK_ELEM_DIAG_60_DEG_UP_TO_FLAT: - case 216: // block brakes + case TRACK_ELEM_BLOCK_BRAKES: currentElement.element->flags &= ~(1 << 5); break; } @@ -4771,7 +4771,7 @@ static void ride_create_vehicles_find_first_block(rct_ride *ride, rct_xy_element break; case TRACK_ELEM_END_STATION: case TRACK_ELEM_CABLE_LIFT_HILL: - case 216: + case TRACK_ELEM_BLOCK_BRAKES: outXYElement->x = x; outXYElement->y = y; outXYElement->element = trackElement; diff --git a/src/openrct2/ride/track.c b/src/openrct2/ride/track.c index 86bb85f53d..5f6aa9330d 100644 --- a/src/openrct2/ride/track.c +++ b/src/openrct2/ride/track.c @@ -1644,7 +1644,7 @@ static money32 track_remove(uint8 type, uint8 sequence, sint16 originX, sint16 o case TRACK_ELEM_CABLE_LIFT_HILL: ride->lifecycle_flags &= ~RIDE_LIFECYCLE_CABLE_LIFT_HILL_COMPONENT_USED; break; - case 216: + case TRACK_ELEM_BLOCK_BRAKES: ride->num_block_brakes--; if (ride->num_block_brakes == 0){ ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_OPERATING; @@ -2138,7 +2138,7 @@ bool track_element_is_block_start(rct_map_element *trackElement) switch (trackElement->properties.track.type) { case TRACK_ELEM_END_STATION: case TRACK_ELEM_CABLE_LIFT_HILL: - case 216: + case TRACK_ELEM_BLOCK_BRAKES: return true; case TRACK_ELEM_25_DEG_UP_TO_FLAT: case TRACK_ELEM_60_DEG_UP_TO_FLAT: