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

Use constants for block brakes and some other elements

This commit is contained in:
Michael Steenbeek 2017-01-13 09:49:29 +01:00 committed by GitHub
parent 7875fd1f3a
commit 2a435bfdae
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/ride/ride.c
View File

@ -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;

4
src/openrct2/ride/track.c
View File

@ -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: