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

Merge pull request #1768 from Gymnasiast/ride-type-flags 

Name RIDE_TYPE_FLAG_8 and _12
This commit is contained in:
Ted John 2015-08-11 23:22:45 +01:00
parent 82ed4a9794 fd715c7c5d
commit 8e3c63f0fd
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ride/ride.c
View File

@ -1641,7 +1641,7 @@ int ride_modify(rct_xy_element *input)
if (ride->type == RIDE_TYPE_MAZE)
return ride_modify_maze(mapElement.element, mapElement.x, mapElement.y);
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_8)) {
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS)) {
if (ride_find_track_gap(&mapElement, &endOfTrackElement))
mapElement = endOfTrackElement;
}

4
src/ride/ride.h
View File

@ -744,11 +744,11 @@ enum {
RIDE_TYPE_FLAG_CAN_SYNCHRONISE_ADJACENT_STATIONS = 1 << 5,
RIDE_TYPE_FLAG_6 = 1 << 6, // used only by boat ride and submarine ride
RIDE_TYPE_FLAG_HAS_G_FORCES = 1 << 7,
RIDE_TYPE_FLAG_8 = 1 << 8, // something to do with track, maybe whether it can have gaps
RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS = 1 << 8, // used by rides that can't have gaps, like those with a vertical tower, such as the observation tower
RIDE_TYPE_FLAG_HAS_DATA_LOGGING = 1 << 9,
RIDE_TYPE_FLAG_HAS_DROPS = 1 << 10,
RIDE_TYPE_FLAG_NO_TEST_MODE = 1 << 11,
RIDE_TYPE_FLAG_12 = 1 << 12, // used only by dinghy slide and water coaster
RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIATIES = 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

8
src/windows/ride_construction.c
View File

@ -1139,7 +1139,7 @@ static void window_ride_construction_resize(rct_window *w)
disabledWidgets |= (1ULL << WIDX_CONSTRUCT);
}
}
if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_12)) {
if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIATIES)) {
disabledWidgets &= ~(1ULL << WIDX_BANKING_GROUPBOX);
}
if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_ENTRANCE_EXIT || _rideConstructionState == RIDE_CONSTRUCTION_STATE_SELECTED) {
@ -2879,7 +2879,7 @@ static void window_ride_construction_update_widgets(rct_window *w)
window_ride_construction_widgets[WIDX_BANK_STRAIGHT].type = WWT_FLATBTN;
window_ride_construction_widgets[WIDX_BANK_RIGHT].type = WWT_FLATBTN;
}
if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_12)) {
if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIATIES)) {
if (rideType == RIDE_TYPE_WATER_COASTER) {
window_ride_construction_widgets[WIDX_U_TRACK].image = 5158;
window_ride_construction_widgets[WIDX_O_TRACK].image = 5159;
@ -2969,7 +2969,7 @@ static void window_ride_construction_update_widgets(rct_window *w)
window_ride_construction_widgets[WIDX_CONSTRUCT].type = WWT_EMPTY;
window_ride_construction_widgets[WIDX_DEMOLISH].type = WWT_FLATBTN;
window_ride_construction_widgets[WIDX_ROTATE].type = WWT_EMPTY;
if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_8)) {
if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS)) {
window_ride_construction_widgets[WIDX_PREVIOUS_SECTION].type = WWT_EMPTY;
window_ride_construction_widgets[WIDX_NEXT_SECTION].type = WWT_EMPTY;
} else {
@ -3061,7 +3061,7 @@ static void window_ride_construction_update_widgets(rct_window *w)
pressedWidgets |= (1ULL << widgetIndex);
if (RCT2_GLOBAL(0x00F440D3, uint8) == 0) {
if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_12)) {
if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIATIES)) {
if (_currentTrackCovered & 1) {
w->pressed_widgets |= (1ULL << WIDX_O_TRACK);
} else {